aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
diff options
context:
space:
mode:
authorGravatar dslomov <dslomov@google.com>2017-07-31 21:07:51 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-08-01 12:21:52 +0200
commitde965ac47e5dedf9dd43004d7523dbfa5ab64de1 (patch)
tree1bca577a04df1c739807a8d3490296717a3b7d7b /src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
parent24183314aaa7887d80d6c1b7b9ce613889bea8e5 (diff)
Better names for declared providers-related classes.
Follows https://docs.google.com/document/d/1aAIVWvHPERDz2cv_PCFGwr8dvh5FcAkENFoRsNS4clk/. RELNOTES: None. PiperOrigin-RevId: 163728291
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java13
1 files changed, 6 insertions, 7 deletions
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 d760a9e20d..983c7a29ff 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.RuleConfiguredTarget;
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 @@ public class SkylarkEvaluationTest extends EvaluationTest {
}
@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(