LocationExpander+GenruleBase: NestedSet not Iterable

This is in preparation for making NestedSet not implement Iterable. PiperOrigin-RevId: 289403912
bazelbuild · Jan 13, 2020 · c035a25 · c035a25
1 parent 137e96e
commit c035a25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java b/src/main/java/com/google/devtools/build/lib/analysis/LocationExpander.java
@@ -175,7 +175,6 @@ public String expandAttribute(String attrName, String attrValue) {
   private String expand(String value, ErrorReporter reporter) {
     int restart = 0;
 
-    int attrLength = value.length();
     StringBuilder result = new StringBuilder(value.length());
 
     while (true) {
@@ -375,8 +374,8 @@ static Map<Label, Collection<Artifact>> buildLocationMap(
     if (ruleContext.getRule().isAttrDefined("srcs", BuildType.LABEL_LIST)) {
       for (TransitiveInfoCollection src : ruleContext
           .getPrerequisitesIf("srcs", Mode.TARGET, FileProvider.class)) {
-        Iterables.addAll(mapGet(locationMap, AliasProvider.getDependencyLabel(src)),
-            src.getProvider(FileProvider.class).getFilesToBuild());
+        mapGet(locationMap, AliasProvider.getDependencyLabel(src))
+            .addAll(src.getProvider(FileProvider.class).getFilesToBuild().toList());
       }
     }
 
@@ -405,7 +404,7 @@ static Map<Label, Collection<Artifact>> buildLocationMap(
       if (executableArtifact != null) {
         mapGet(locationMap, label).add(executableArtifact);
       } else {
-        Iterables.addAll(mapGet(locationMap, label), filesToRun.getFilesToRun());
+        mapGet(locationMap, label).addAll(filesToRun.getFilesToRun().toList());
       }
     }
     return locationMap;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java
@@ -132,15 +132,17 @@ public ConfiguredTarget create(RuleContext ruleContext)
 
     Pair<CommandType, String> cmdTypeAndAttr = determineCommandTypeAndAttribute(ruleContext);
 
-    ImmutableMap.Builder<Label, NestedSet<Artifact>> labelMap = ImmutableMap.builder();
+    ImmutableMap.Builder<Label, Iterable<Artifact>> labelMap = ImmutableMap.builder();
     for (TransitiveInfoCollection dep : ruleContext.getPrerequisites("srcs", Mode.TARGET)) {
       // This target provides specific types of files for genrules.
       GenRuleSourcesProvider provider = dep.getProvider(GenRuleSourcesProvider.class);
       NestedSet<Artifact> files = (provider != null)
           ? provider.getGenruleFiles()
           : dep.getProvider(FileProvider.class).getFilesToBuild();
       resolvedSrcsBuilder.addTransitive(files);
-      labelMap.put(AliasProvider.getDependencyLabel(dep), files);
+      // The CommandHelper class makes an explicit copy of this in the constructor, so flattening
+      // here should be benign.
+      labelMap.put(AliasProvider.getDependencyLabel(dep), files.toList());
     }
     NestedSet<Artifact> resolvedSrcs = resolvedSrcsBuilder.build();