diff options
| author |  dslomov <dslomov@google.com> | 2017-07-10 17:15:27 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-07-10 17:45:04 +0200 |
| commit | 77baa4c372ae014db8e17f6d3c60bd88597853d9 (patch) | |
| tree | 3ca2c63943782b506b0f19f5b7f7465909723590 /src/main/java/com/google/devtools/build/lib/rules/test | |
| parent | 45bd34e747d13fc2bebdc849a11b4b952da5d8a6 (diff) | |
Make native declared providers type-safe.
RELNOTES: None.
PiperOrigin-RevId: 161395570
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/test')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/ExecutionInfoProvider.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/test/TestEnvironmentProvider.java | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/ExecutionInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/test/ExecutionInfoProvider.java index 5567f2719a..4f17ec199c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/ExecutionInfoProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/ExecutionInfoProvider.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.test; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.packages.ClassObjectConstructor; import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; import com.google.devtools.build.lib.packages.SkylarkClassObject; import java.util.Map; @@ -30,9 +29,9 @@ public final class ExecutionInfoProvider extends SkylarkClassObject implements TransitiveInfoProvider { /** Skylark constructor and identifier for ExecutionInfoProvider. */ - public static final ClassObjectConstructor SKYLARK_CONSTRUCTOR = - new NativeClassObjectConstructor("ExecutionInfo") { - }; + public static final NativeClassObjectConstructor<ExecutionInfoProvider> SKYLARK_CONSTRUCTOR = + new NativeClassObjectConstructor<ExecutionInfoProvider>( + ExecutionInfoProvider.class, "ExecutionInfo") {}; private final ImmutableMap<String, String> executionInfo; diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestEnvironmentProvider.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestEnvironmentProvider.java index e2b5fc8510..240738dde5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/TestEnvironmentProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestEnvironmentProvider.java @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.packages.ClassObjectConstructor; import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; import com.google.devtools.build.lib.packages.SkylarkClassObject; import java.util.Map; @@ -29,8 +28,9 @@ public final class TestEnvironmentProvider extends SkylarkClassObject implements TransitiveInfoProvider { /** Skylark constructor and identifier for TestEnvironmentProvider. */ - public static final ClassObjectConstructor SKYLARK_CONSTRUCTOR = - new NativeClassObjectConstructor("TestEnvironment") { }; + public static final NativeClassObjectConstructor<TestEnvironmentProvider> SKYLARK_CONSTRUCTOR = + new NativeClassObjectConstructor<TestEnvironmentProvider>( + TestEnvironmentProvider.class, "TestEnvironment") {}; private final Map<String, String> environment; |