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/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index d760a9e..983c7a2 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -25,8 +25,8 @@
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.packages.NativeClassObjectConstructor;
-import com.google.devtools.build.lib.packages.SkylarkClassObject;
+import com.google.devtools.build.lib.packages.Info;
+import com.google.devtools.build.lib.packages.NativeProvider;
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
@@ -1424,11 +1424,10 @@
}
@SkylarkModule(name = "SkylarkClassObjectWithSkylarkCallables", doc = "")
- static final class SkylarkClassObjectWithSkylarkCallables extends SkylarkClassObject {
- private static final NativeClassObjectConstructor<SkylarkClassObjectWithSkylarkCallables>
- CONSTRUCTOR =
- new NativeClassObjectConstructor<SkylarkClassObjectWithSkylarkCallables>(
- SkylarkClassObjectWithSkylarkCallables.class, "struct_with_skylark_callables") {};
+ static final class SkylarkClassObjectWithSkylarkCallables extends Info {
+ private static final NativeProvider<SkylarkClassObjectWithSkylarkCallables> CONSTRUCTOR =
+ new NativeProvider<SkylarkClassObjectWithSkylarkCallables>(
+ SkylarkClassObjectWithSkylarkCallables.class, "struct_with_skylark_callables") {};
SkylarkClassObjectWithSkylarkCallables() {
super(