commit 48670f8e64d32be460f8567a0b9f5754844e7d90
author Francois-Rene Rideau <tunes@google.com> Thu Mar 19 17:23:35 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Fri Mar 20 14:37:42 2015 +0000
tree 7dba505ef3b72fb34f58913d70ec3b1b598fe304
parent 1e382d368bf8ec511af3d790f79134c447bc77fe

Move cast* utilities to SkylarkType

Move castList, castMap, toMap utilities away from SkylarkFunction to SkylarkType
where the cast utility already has been moved.

--
MOS_MIGRATED_REVID=89042835

src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
index 37cd398..39f9bf8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
@@ -22,6 +22,9 @@
 import static com.google.devtools.build.lib.packages.Type.LABEL;
 import static com.google.devtools.build.lib.packages.Type.LABEL_LIST;
 import static com.google.devtools.build.lib.packages.Type.STRING;
+import static com.google.devtools.build.lib.syntax.SkylarkType.castList;
+import static com.google.devtools.build.lib.syntax.SkylarkType.castMap;
+import static com.google.devtools.build.lib.syntax.SkylarkType.toMap;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.CacheBuilder;
@@ -223,6 +226,7 @@
   private static final SkylarkFunction rule = new SkylarkFunction("rule") {
 
         @Override
+        @SuppressWarnings("rawtypes")
         public Object call(Map<String, Object> arguments, FuncallExpression ast,
             Environment funcallEnv) throws EvalException, ConversionException {
           final Location loc = ast.getLocation();