commit 1d273cd492f79f018ee05bf6019c6f9caba34673
author laurentlb <laurentlb@google.com> Wed May 16 12:12:26 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed May 16 12:14:08 2018 -0700
tree 97130ef346a1532cd9561db7719bab8f9a18a4d2
parent 14c8de626fbd5a63cf843b98c3bef055071d361c

Remove glob list from native rules

Since the glob() function now returns a standard list, some code can be
simplified.

RELNOTES: None.
PiperOrigin-RevId: 196867957

src/main/java/com/google/devtools/build/lib/packages/RuleClass.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index bd1f4b4..0389764 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -50,7 +50,6 @@
 import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.FuncallExpression;
-import com.google.devtools.build.lib.syntax.GlobList;
 import com.google.devtools.build.lib.syntax.Runtime;
 import com.google.devtools.build.lib.syntax.SkylarkList;
 import com.google.devtools.build.lib.syntax.Type;
@@ -1976,11 +1975,11 @@
 
   /**
    * Converts the build-language-typed {@code buildLangValue} to a native value via {@link
-   * BuildType#selectableConvert}. Canonicalizes the value's order if it is a {@link List} type
-   * (but not a {@link GlobList}) and {@code attr.isOrderIndependent()} returns {@code true}.
+   * BuildType#selectableConvert}. Canonicalizes the value's order if it is a {@link List} type and
+   * {@code attr.isOrderIndependent()} returns {@code true}.
    *
-   * <p>Throws {@link ConversionException} if the conversion fails, or if {@code buildLangValue}
-   * is a selector expression but {@code attr.isConfigurable()} is {@code false}.
+   * <p>Throws {@link ConversionException} if the conversion fails, or if {@code buildLangValue} is
+   * a selector expression but {@code attr.isConfigurable()} is {@code false}.
    */
   private static Object convertFromBuildLangType(Rule rule, Attribute attr, Object buildLangValue)
       throws ConversionException {
@@ -1995,7 +1994,7 @@
           String.format("attribute \"%s\" is not configurable", attr.getName()));
     }
 
-    if ((converted instanceof List<?>) && !(converted instanceof GlobList<?>)) {
+    if (converted instanceof List<?>) {
       if (attr.isOrderIndependent()) {
         @SuppressWarnings("unchecked")
         List<? extends Comparable<?>> list = (List<? extends Comparable<?>>) converted;