Remove FileProvider.label.

--
MOS_MIGRATED_REVID=120539626

5 files changed, 9 insertions, 31 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java
index d7dc1d322c..86b837fbed 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/FileConfiguredTarget.java
@@ -45,7 +45,7 @@ public abstract class FileConfiguredTarget extends AbstractConfiguredTarget
         .<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider>builder()
         .put(VisibilityProvider.class, this)
         .put(LicensesProvider.class, this)
-        .put(FileProvider.class, new FileProvider(targetContext.getLabel(), filesToBuild))
+        .put(FileProvider.class, new FileProvider(filesToBuild))
         .put(FilesToRunProvider.class, FilesToRunProvider.fromSingleExecutableArtifact(artifact));
     if (this instanceof FilesetProvider) {
       builder.put(FilesetProvider.class, this);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java
index b63ca8c346..0b4dd3b712 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java
@@ -15,14 +15,13 @@
 package com.google.devtools.build.lib.analysis;
 
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 
-import javax.annotation.Nullable;
-
 /**
  * A representation of the concept "this transitive info provider builds these files".
  *
@@ -31,29 +30,16 @@ import javax.annotation.Nullable;
 @Immutable
 @SkylarkModule(name = "file_provider", doc = "An interface for rules that provide files.")
 public final class FileProvider implements TransitiveInfoProvider {
+  public static final FileProvider EMPTY =
+      new FileProvider(NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
 
-  @Nullable private final Label label;
   private final NestedSet<Artifact> filesToBuild;
 
-  public FileProvider(@Nullable Label label, NestedSet<Artifact> filesToBuild) {
-    this.label = label;
+  public FileProvider(NestedSet<Artifact> filesToBuild) {
     this.filesToBuild = filesToBuild;
   }
 
   /**
-   * Returns the label that is associated with this piece of information.
-   *
-   * <p>This is usually the label of the target that provides the information.
-   */
-  @SkylarkCallable(name = "label", doc = "", structField = true)
-  public Label getLabel() {
-    if (label == null) {
-      throw new UnsupportedOperationException();
-    }
-    return label;
-  }
-
-  /**
    * Returns the set of artifacts that are the "output" of this rule.
    *
    * <p>The term "output" is somewhat hazily defined; it is vaguely the set of files that are
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index 09f500b34e..07b0d863c9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -83,7 +83,7 @@ public final class RuleConfiguredTargetBuilder {
 
     FilesToRunProvider filesToRunProvider = new FilesToRunProvider(
         getFilesToRun(runfilesSupport, filesToBuild), runfilesSupport, executable);
-    add(FileProvider.class, new FileProvider(ruleContext.getLabel(), filesToBuild));
+    add(FileProvider.class, new FileProvider(filesToBuild));
     add(FilesToRunProvider.class, filesToRunProvider);
     addSkylarkTransitiveInfo(FilesToRunProvider.SKYLARK_NAME, filesToRunProvider);
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigSetting.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigSetting.java
index 87770e7770..331c47eba4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigSetting.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigSetting.java
@@ -16,15 +16,12 @@ package com.google.devtools.build.lib.analysis.config;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.FileProvider;
 import com.google.devtools.build.lib.analysis.FilesToRunProvider;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
-import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 import com.google.devtools.build.lib.syntax.Type;
@@ -69,8 +66,7 @@ public class ConfigSetting implements RuleConfiguredTargetFactory {
 
     return new RuleConfiguredTargetBuilder(ruleContext)
         .add(RunfilesProvider.class, RunfilesProvider.EMPTY)
-        .add(FileProvider.class, new FileProvider(ruleContext.getLabel(),
-            NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER)))
+        .add(FileProvider.class, FileProvider.EMPTY)
         .add(FilesToRunProvider.class, FilesToRunProvider.EMPTY)
         .add(ConfigMatchingProvider.class, configMatcher)
         .build();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/constraints/Environment.java b/src/main/java/com/google/devtools/build/lib/analysis/constraints/Environment.java
index 1ba553ba88..c8be4087a5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/constraints/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/constraints/Environment.java
@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.lib.analysis.constraints;
 
-import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.FileProvider;
 import com.google.devtools.build.lib.analysis.FilesToRunProvider;
@@ -22,8 +21,6 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
 import com.google.devtools.build.lib.analysis.RuleContext;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.packages.EnvironmentGroup;
 import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory;
 
@@ -51,8 +48,7 @@ public class Environment implements RuleConfiguredTargetFactory {
     return new RuleConfiguredTargetBuilder(ruleContext)
         .addProvider(SupportedEnvironmentsProvider.class, new SupportedEnvironments(env, env))
         .addProvider(RunfilesProvider.class, RunfilesProvider.EMPTY)
-        .add(FileProvider.class, new FileProvider(ruleContext.getLabel(),
-            NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER)))
+        .add(FileProvider.class, FileProvider.EMPTY)
         .add(FilesToRunProvider.class, FilesToRunProvider.EMPTY)
         .build();
   }