Better names for declared providers-related classes.
Follows
https://docs.google.com/document/d/1aAIVWvHPERDz2cv_PCFGwr8dvh5FcAkENFoRsNS4clk/.
RELNOTES: None.
PiperOrigin-RevId: 163728291
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index 4e0c62b..23df295 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -28,8 +28,8 @@
import com.google.devtools.build.lib.packages.AspectClass;
import com.google.devtools.build.lib.packages.AspectDescriptor;
import com.google.devtools.build.lib.packages.AspectParameters;
-import com.google.devtools.build.lib.packages.ClassObjectConstructor;
-import com.google.devtools.build.lib.packages.SkylarkClassObject;
+import com.google.devtools.build.lib.packages.Info;
+import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.util.Preconditions;
@@ -97,7 +97,7 @@
}
}
- public SkylarkClassObject get(ClassObjectConstructor.Key key) {
+ public Info get(Provider.Key key) {
return providers.getProvider(key);
}
@@ -205,9 +205,9 @@
return this;
}
- public Builder addSkylarkDeclaredProvider(SkylarkClassObject declaredProvider, Location loc)
+ public Builder addSkylarkDeclaredProvider(Info declaredProvider, Location loc)
throws EvalException {
- ClassObjectConstructor constructor = declaredProvider.getConstructor();
+ Provider constructor = declaredProvider.getProvider();
if (!constructor.isExported()) {
throw new EvalException(
constructor.getLocation(), "All providers must be top level values");
@@ -216,12 +216,12 @@
return this;
}
- private void addDeclaredProvider(SkylarkClassObject declaredProvider) {
+ private void addDeclaredProvider(Info declaredProvider) {
providers.put(declaredProvider);
}
- public Builder addNativeDeclaredProvider(SkylarkClassObject declaredProvider) {
- ClassObjectConstructor constructor = declaredProvider.getConstructor();
+ public Builder addNativeDeclaredProvider(Info declaredProvider) {
+ Provider constructor = declaredProvider.getProvider();
Preconditions.checkState(constructor.isExported());
addDeclaredProvider(declaredProvider);
return this;