The great Skylark -> Starlark class migration:
SkylarkDictCodec
SkylarkListCodec
SkylarkProviderIdentifierCodec
SkylarkSemanticsVersionGetter
SkylarkDictCodecTest
SkylarkProviderCodecTest
SkylarkProvider
SkylarkProvider.SkylarkKey
SkylarkProviderTest
PiperOrigin-RevId: 307399612
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index cfecf48..4b6de4c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -69,8 +69,8 @@
import com.google.devtools.build.lib.packages.SkylarkAspect;
import com.google.devtools.build.lib.packages.SkylarkDefinedAspect;
import com.google.devtools.build.lib.packages.SkylarkExportable;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
import com.google.devtools.build.lib.packages.StarlarkCallbackHelper;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
import com.google.devtools.build.lib.packages.TargetUtils;
import com.google.devtools.build.lib.packages.TestSize;
@@ -257,7 +257,7 @@
: fields instanceof Dict
? Dict.cast(fields, String.class, String.class, "fields").keySet()
: null;
- return SkylarkProvider.createUnexportedSchemaful(fieldNames, thread.getCallerLocation());
+ return StarlarkProvider.createUnexportedSchemaful(fieldNames, thread.getCallerLocation());
}
// TODO(bazel-team): implement attribute copy and other rule properties
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
index e886059..bf19f3a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppSemantics.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.cpp.AspectLegalCppSemantics;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
@@ -41,12 +41,12 @@
// The reason for that is that when we are in a target inside @rules_cc, the provider won't have
// the repo name set.
public static final Provider.Key CC_SHARED_INFO_PROVIDER_RULES_CC =
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsoluteUnchecked("@rules_cc//examples:experimental_cc_shared_library.bzl"),
"CcSharedLibraryInfo");
public static final Provider.Key CC_SHARED_INFO_PROVIDER =
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsoluteUnchecked("//examples:experimental_cc_shared_library.bzl"),
"CcSharedLibraryInfo");
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Provider.java b/src/main/java/com/google/devtools/build/lib/packages/Provider.java
index be4fc42..1a69159 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Provider.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Provider.java
@@ -22,7 +22,7 @@
* Declared Provider (a constructor for {@link Info}).
*
* <p>Declared providers can be declared either natively ({@link NativeProvider} or in Starlark
- * {@link SkylarkProvider}.
+ * {@link StarlarkProvider}.
*
* <p>{@link Provider} serves both as "type identifier" for declared provider instances and as a
* function that can be called to construct a provider. To the Starlark user, there are "providers"
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java
similarity index 84%
rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkProvider.java
rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java
index 09ac35a..ff0b638 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java
@@ -45,7 +45,7 @@
* pre-exported provider directly. Exported providers use only their key for {@link #equals} and
* {@link #hashCode}.
*/
-public final class SkylarkProvider extends BaseFunction implements SkylarkExportable, Provider {
+public final class StarlarkProvider extends BaseFunction implements SkylarkExportable, Provider {
/** Default value for {@link #errorMessageFormatForUnknownField}. */
private static final String DEFAULT_ERROR_MESSAGE_FORMAT = "Object has no '%s' attribute.";
@@ -61,25 +61,25 @@
/** Null iff this provider has not yet been exported. */
@Nullable
- private SkylarkKey key;
+ private Key key;
/** Error message format. Reassigned upon exporting. */
private String errorMessageFormatForUnknownField;
/**
- * Creates an unexported {@link SkylarkProvider} with no schema.
+ * Creates an unexported {@link StarlarkProvider} with no schema.
*
* <p>The resulting object needs to be exported later (via {@link #export}).
*
* @param location the location of the Starlark definition for this provider (tests may use {@link
* Location#BUILTIN})
*/
- public static SkylarkProvider createUnexportedSchemaless(Location location) {
- return new SkylarkProvider(/*key=*/ null, /*fields=*/ null, location);
+ public static StarlarkProvider createUnexportedSchemaless(Location location) {
+ return new StarlarkProvider(/*key=*/ null, /*fields=*/ null, location);
}
/**
- * Creates an unexported {@link SkylarkProvider} with a schema.
+ * Creates an unexported {@link StarlarkProvider} with a schema.
*
* <p>The resulting object needs to be exported later (via {@link #export}).
*
@@ -88,25 +88,25 @@
* Location#BUILTIN})
*/
// TODO(adonovan): in what sense is this "schemaful" if fields is null?
- public static SkylarkProvider createUnexportedSchemaful(
+ public static StarlarkProvider createUnexportedSchemaful(
@Nullable Collection<String> fields, Location location) {
- return new SkylarkProvider(
+ return new StarlarkProvider(
/*key=*/ null, fields == null ? null : ImmutableList.sortedCopyOf(fields), location);
}
/**
- * Creates an exported {@link SkylarkProvider} with no schema.
+ * Creates an exported {@link StarlarkProvider} with no schema.
*
* @param key the key that identifies this provider
* @param location the location of the Starlark definition for this provider (tests may use {@link
* Location#BUILTIN})
*/
- public static SkylarkProvider createExportedSchemaless(SkylarkKey key, Location location) {
- return new SkylarkProvider(key, /*fields=*/ null, location);
+ public static StarlarkProvider createExportedSchemaless(Key key, Location location) {
+ return new StarlarkProvider(key, /*fields=*/ null, location);
}
/**
- * Creates an exported {@link SkylarkProvider} with no schema.
+ * Creates an exported {@link StarlarkProvider} with no schema.
*
* @param key the key that identifies this provider
* @param fields the allowed field names for instances of this provider
@@ -114,9 +114,9 @@
* Location#BUILTIN})
*/
// TODO(adonovan): in what sense is this "schemaful" if fields is null?
- public static SkylarkProvider createExportedSchemaful(
- SkylarkKey key, @Nullable Collection<String> fields, Location location) {
- return new SkylarkProvider(
+ public static StarlarkProvider createExportedSchemaful(
+ Key key, @Nullable Collection<String> fields, Location location) {
+ return new StarlarkProvider(
key, fields == null ? null : ImmutableList.sortedCopyOf(fields), location);
}
@@ -126,8 +126,8 @@
* <p>If {@code key} is null, the provider is unexported. If {@code fields} is null, the provider
* is schemaless.
*/
- private SkylarkProvider(
- @Nullable SkylarkKey key, @Nullable ImmutableList<String> fields, Location location) {
+ private StarlarkProvider(
+ @Nullable Key key, @Nullable ImmutableList<String> fields, Location location) {
this.signature = buildSignature(fields);
this.location = location;
this.fields = fields;
@@ -180,7 +180,7 @@
}
@Override
- public SkylarkKey getKey() {
+ public Key getKey() {
Preconditions.checkState(isExported());
return key;
}
@@ -209,7 +209,7 @@
@Override
public void export(Label extensionLabel, String exportedName) {
Preconditions.checkState(!isExported());
- this.key = new SkylarkKey(extensionLabel, exportedName);
+ this.key = new Key(extensionLabel, exportedName);
this.errorMessageFormatForUnknownField = makeErrorMessageFormatForUnknownField(exportedName);
}
@@ -227,10 +227,10 @@
@Override
public boolean equals(@Nullable Object otherObject) {
- if (!(otherObject instanceof SkylarkProvider)) {
+ if (!(otherObject instanceof StarlarkProvider)) {
return false;
}
- SkylarkProvider other = (SkylarkProvider) otherObject;
+ StarlarkProvider other = (StarlarkProvider) otherObject;
if (this.isExported() && other.isExported()) {
return this.getKey().equals(other.getKey());
@@ -251,15 +251,15 @@
}
/**
- * A serializable representation of Starlark-defined {@link SkylarkProvider} that uniquely
- * identifies all {@link SkylarkProvider}s that are exposed to SkyFrame.
+ * A serializable representation of Starlark-defined {@link StarlarkProvider} that uniquely
+ * identifies all {@link StarlarkProvider}s that are exposed to SkyFrame.
*/
@AutoCodec
- public static class SkylarkKey extends Key {
+ public static class Key extends Provider.Key {
private final Label extensionLabel;
private final String exportedName;
- public SkylarkKey(Label extensionLabel, String exportedName) {
+ public Key(Label extensionLabel, String exportedName) {
this.extensionLabel = Preconditions.checkNotNull(extensionLabel);
this.exportedName = Preconditions.checkNotNull(exportedName);
}
@@ -288,10 +288,10 @@
return true;
}
- if (!(obj instanceof SkylarkKey)) {
+ if (!(obj instanceof Key)) {
return false;
}
- SkylarkKey other = (SkylarkKey) obj;
+ Key other = (Key) obj;
return Objects.equals(this.extensionLabel, other.extensionLabel)
&& Objects.equals(this.exportedName, other.exportedName);
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java
index 5e263a7..7457c9b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkAttrTransitionProviderTest.java
@@ -29,7 +29,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkInfo;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.BazelMockAndroidSupport;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
@@ -62,7 +62,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
index 626b1f0..88a2b88 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.syntax.Dict;
import org.junit.Test;
@@ -54,7 +54,7 @@
ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/config_skylark:my_target");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//examples/rule:config_test.bzl", ImmutableMap.of()), "MyInfo");
StructImpl myInfo = (StructImpl) skylarkTarget.get(key);
assertThat(((Dict) myInfo.getValue("test_env")).get("TEST_ENV_VAR")).isEqualTo("my_value");
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java b/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java
index f1f11be..ce61425 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RequiredProvidersTest.java
@@ -37,8 +37,8 @@
private static final Provider P_NATIVE =
new NativeProvider<StructImpl>(StructImpl.class, "p_native") {};
- private static final SkylarkProvider P_SKYLARK =
- SkylarkProvider.createUnexportedSchemaless(Location.BUILTIN);
+ private static final StarlarkProvider P_SKYLARK =
+ StarlarkProvider.createUnexportedSchemaless(Location.BUILTIN);
static {
try {
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java
index d5470d4..63906cd 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java
@@ -40,21 +40,21 @@
@Test
public void instancesOfUnexportedProvidersAreMutable() throws Exception {
- SkylarkProvider provider = makeProvider();
+ StarlarkProvider provider = makeProvider();
SkylarkInfo info = makeInfoWithF1F2Values(provider, 5, null);
assertThat(info.isImmutable()).isFalse();
}
@Test
public void instancesOfExportedProvidersMayBeImmutable() throws Exception {
- SkylarkProvider provider = makeExportedProvider();
+ StarlarkProvider provider = makeExportedProvider();
SkylarkInfo info = makeInfoWithF1F2Values(provider, 5, null);
assertThat(info.isImmutable()).isTrue();
}
@Test
public void mutableIfContentsAreMutable() throws Exception {
- SkylarkProvider provider = makeExportedProvider();
+ StarlarkProvider provider = makeExportedProvider();
StarlarkValue v = new StarlarkValue() {};
SkylarkInfo info = makeInfoWithF1F2Values(provider, 5, v);
assertThat(info.isImmutable()).isFalse();
@@ -62,8 +62,8 @@
@Test
public void equivalence() throws Exception {
- SkylarkProvider provider1 = makeProvider();
- SkylarkProvider provider2 = makeProvider();
+ StarlarkProvider provider1 = makeProvider();
+ StarlarkProvider provider2 = makeProvider();
// equal providers and fields
assertThat(makeInfoWithF1F2Values(provider1, 4, 5))
.isEqualTo(makeInfoWithF1F2Values(provider1, 4, 5));
@@ -80,8 +80,8 @@
@Test
public void concatWithDifferentProvidersFails() throws Exception {
- SkylarkProvider provider1 = makeProvider();
- SkylarkProvider provider2 = makeProvider();
+ StarlarkProvider provider1 = makeProvider();
+ StarlarkProvider provider2 = makeProvider();
SkylarkInfo info1 = makeInfoWithF1F2Values(provider1, 4, 5);
SkylarkInfo info2 = makeInfoWithF1F2Values(provider2, 4, 5);
EvalException expected =
@@ -92,7 +92,7 @@
@Test
public void concatWithOverlappingFieldsFails() throws Exception {
- SkylarkProvider provider1 = makeProvider();
+ StarlarkProvider provider1 = makeProvider();
SkylarkInfo info1 = makeInfoWithF1F2Values(provider1, 4, 5);
SkylarkInfo info2 = makeInfoWithF1F2Values(provider1, 4, null);
EvalException expected =
@@ -104,7 +104,7 @@
@Test
public void concatWithSameFields() throws Exception {
- SkylarkProvider provider = makeProvider();
+ StarlarkProvider provider = makeProvider();
SkylarkInfo info1 = makeInfoWithF1F2Values(provider, 4, null);
SkylarkInfo info2 = makeInfoWithF1F2Values(provider, null, 5);
SkylarkInfo result = info1.binaryOp(TokenKind.PLUS, info2, true);
@@ -115,7 +115,7 @@
@Test
public void concatWithDifferentFields() throws Exception {
- SkylarkProvider provider = makeProvider();
+ StarlarkProvider provider = makeProvider();
SkylarkInfo info1 = makeInfoWithF1F2Values(provider, 4, null);
SkylarkInfo info2 = makeInfoWithF1F2Values(provider, null, 5);
SkylarkInfo result = info1.binaryOp(TokenKind.PLUS, info2, true);
@@ -125,15 +125,15 @@
}
/** Creates an unexported schemaless provider type with builtin location. */
- private static SkylarkProvider makeProvider() {
- return SkylarkProvider.createUnexportedSchemaless(Location.BUILTIN);
+ private static StarlarkProvider makeProvider() {
+ return StarlarkProvider.createUnexportedSchemaless(Location.BUILTIN);
}
/** Creates an exported schemaless provider type with builtin location. */
- private static SkylarkProvider makeExportedProvider() {
- SkylarkProvider.SkylarkKey key = new SkylarkProvider.SkylarkKey(
- Label.parseAbsoluteUnchecked("//package:target"), "provider");
- return SkylarkProvider.createExportedSchemaless(key, Location.BUILTIN);
+ private static StarlarkProvider makeExportedProvider() {
+ StarlarkProvider.Key key =
+ new StarlarkProvider.Key(Label.parseAbsoluteUnchecked("//package:target"), "provider");
+ return StarlarkProvider.createExportedSchemaless(key, Location.BUILTIN);
}
/**
@@ -141,7 +141,7 @@
* value may be null, in which case it is omitted.
*/
private static SkylarkInfo makeInfoWithF1F2Values(
- SkylarkProvider provider, @Nullable Object v1, @Nullable Object v2) {
+ StarlarkProvider provider, @Nullable Object v1, @Nullable Object v2) {
ImmutableMap.Builder<String, Object> values = ImmutableMap.builder();
if (v1 != null) {
values.put("f1", v1);
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkProviderTest.java b/src/test/java/com/google/devtools/build/lib/packages/StarlarkProviderTest.java
similarity index 68%
rename from src/test/java/com/google/devtools/build/lib/packages/SkylarkProviderTest.java
rename to src/test/java/com/google/devtools/build/lib/packages/StarlarkProviderTest.java
index 1bb7c36..f739fba 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/StarlarkProviderTest.java
@@ -21,7 +21,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.testing.EqualsTester;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
import com.google.devtools.build.lib.syntax.Mutability;
import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkThread;
@@ -29,13 +28,13 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-/** Tests for {@link SkylarkProvider}. */
+/** Tests for {@link StarlarkProvider}. */
@RunWith(JUnit4.class)
-public final class SkylarkProviderTest {
+public final class StarlarkProviderTest {
@Test
public void unexportedProvider_Accessors() {
- SkylarkProvider provider = SkylarkProvider.createUnexportedSchemaless(/*location=*/ null);
+ StarlarkProvider provider = StarlarkProvider.createUnexportedSchemaless(/*location=*/ null);
assertThat(provider.isExported()).isFalse();
assertThat(provider.getName()).isEqualTo("<no name>");
assertThat(provider.getPrintableName()).isEqualTo("<no name>");
@@ -50,9 +49,9 @@
@Test
public void exportedProvider_Accessors() throws Exception {
- SkylarkKey key =
- new SkylarkKey(Label.parseAbsolute("//foo:bar.bzl", ImmutableMap.of()), "prov");
- SkylarkProvider provider = SkylarkProvider.createExportedSchemaless(key, /*location=*/ null);
+ StarlarkProvider.Key key =
+ new StarlarkProvider.Key(Label.parseAbsolute("//foo:bar.bzl", ImmutableMap.of()), "prov");
+ StarlarkProvider provider = StarlarkProvider.createExportedSchemaless(key, /*location=*/ null);
assertThat(provider.isExported()).isTrue();
assertThat(provider.getName()).isEqualTo("prov");
assertThat(provider.getPrintableName()).isEqualTo("prov");
@@ -65,14 +64,14 @@
@Test
public void schemalessProvider_Instantiation() throws Exception {
- SkylarkProvider provider = SkylarkProvider.createUnexportedSchemaless(/*location=*/ null);
+ StarlarkProvider provider = StarlarkProvider.createUnexportedSchemaless(/*location=*/ null);
SkylarkInfo info = instantiateWithA1B2C3(provider);
assertHasExactlyValuesA1B2C3(info);
}
@Test
public void schemafulProvider_Instantiation() throws Exception {
- SkylarkProvider provider = SkylarkProvider.createUnexportedSchemaful(
+ StarlarkProvider provider = StarlarkProvider.createUnexportedSchemaful(
ImmutableList.of("a", "b", "c"), /*location=*/ null);
SkylarkInfo info = instantiateWithA1B2C3(provider);
assertHasExactlyValuesA1B2C3(info);
@@ -80,13 +79,13 @@
@Test
public void schemalessProvider_GetFields() throws Exception {
- SkylarkProvider provider = SkylarkProvider.createUnexportedSchemaless(/*location=*/ null);
+ StarlarkProvider provider = StarlarkProvider.createUnexportedSchemaless(/*location=*/ null);
assertThat(provider.getFields()).isNull();
}
@Test
public void schemafulProvider_GetFields() throws Exception {
- SkylarkProvider provider = SkylarkProvider.createUnexportedSchemaful(
+ StarlarkProvider provider = StarlarkProvider.createUnexportedSchemaful(
ImmutableList.of("a", "b", "c"), /*location=*/ null);
assertThat(provider.getFields()).containsExactly("a", "b", "c").inOrder();
}
@@ -94,30 +93,30 @@
@Test
public void providerEquals() throws Exception {
// All permutations of differing label and differing name.
- SkylarkKey keyFooA =
- new SkylarkKey(Label.parseAbsolute("//foo.bzl", ImmutableMap.of()), "provA");
- SkylarkKey keyFooB =
- new SkylarkKey(Label.parseAbsolute("//foo.bzl", ImmutableMap.of()), "provB");
- SkylarkKey keyBarA =
- new SkylarkKey(Label.parseAbsolute("//bar.bzl", ImmutableMap.of()), "provA");
- SkylarkKey keyBarB =
- new SkylarkKey(Label.parseAbsolute("//bar.bzl", ImmutableMap.of()), "provB");
+ StarlarkProvider.Key keyFooA =
+ new StarlarkProvider.Key(Label.parseAbsolute("//foo.bzl", ImmutableMap.of()), "provA");
+ StarlarkProvider.Key keyFooB =
+ new StarlarkProvider.Key(Label.parseAbsolute("//foo.bzl", ImmutableMap.of()), "provB");
+ StarlarkProvider.Key keyBarA =
+ new StarlarkProvider.Key(Label.parseAbsolute("//bar.bzl", ImmutableMap.of()), "provA");
+ StarlarkProvider.Key keyBarB =
+ new StarlarkProvider.Key(Label.parseAbsolute("//bar.bzl", ImmutableMap.of()), "provB");
// 1 for each key, plus a duplicate for one of the keys, plus 2 that have no key.
- SkylarkProvider provFooA1 =
- SkylarkProvider.createExportedSchemaless(keyFooA, /*location=*/ null);
- SkylarkProvider provFooA2 =
- SkylarkProvider.createExportedSchemaless(keyFooA, /*location=*/ null);
- SkylarkProvider provFooB =
- SkylarkProvider.createExportedSchemaless(keyFooB, /*location=*/ null);
- SkylarkProvider provBarA =
- SkylarkProvider.createExportedSchemaless(keyBarA, /*location=*/ null);
- SkylarkProvider provBarB =
- SkylarkProvider.createExportedSchemaless(keyBarB, /*location=*/ null);
- SkylarkProvider provUnexported1 =
- SkylarkProvider.createUnexportedSchemaless(/*location=*/ null);
- SkylarkProvider provUnexported2 =
- SkylarkProvider.createUnexportedSchemaless(/*location=*/ null);
+ StarlarkProvider provFooA1 =
+ StarlarkProvider.createExportedSchemaless(keyFooA, /*location=*/ null);
+ StarlarkProvider provFooA2 =
+ StarlarkProvider.createExportedSchemaless(keyFooA, /*location=*/ null);
+ StarlarkProvider provFooB =
+ StarlarkProvider.createExportedSchemaless(keyFooB, /*location=*/ null);
+ StarlarkProvider provBarA =
+ StarlarkProvider.createExportedSchemaless(keyBarA, /*location=*/ null);
+ StarlarkProvider provBarB =
+ StarlarkProvider.createExportedSchemaless(keyBarB, /*location=*/ null);
+ StarlarkProvider provUnexported1 =
+ StarlarkProvider.createUnexportedSchemaless(/*location=*/ null);
+ StarlarkProvider provUnexported2 =
+ StarlarkProvider.createUnexportedSchemaless(/*location=*/ null);
// For exported providers, different keys -> unequal, same key -> equal. For unexported
// providers it comes down to object identity.
@@ -132,7 +131,7 @@
}
/** Instantiates a {@link SkylarkInfo} with fields a=1, b=2, c=3 (and nothing else). */
- private static SkylarkInfo instantiateWithA1B2C3(SkylarkProvider provider) throws Exception{
+ private static SkylarkInfo instantiateWithA1B2C3(StarlarkProvider provider) throws Exception{
StarlarkThread thread =
StarlarkThread.builder(Mutability.create("test")).useDefaultSemantics().build();
Object result =
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
index acbbda7..f5c63de 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.BazelMockAndroidSupport;
import com.google.devtools.build.lib.syntax.Starlark;
@@ -73,7 +73,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleRulesTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleRulesTest.java
index 6ab71a9..64ece7d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/AppleRulesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/AppleRulesTest.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.MockObjcSupport;
import com.google.devtools.build.lib.syntax.Sequence;
@@ -113,8 +113,9 @@
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey fooKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
+ StarlarkProvider.Key fooKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
StructImpl fooProvider = (StructImpl) configuredAspect.get(fooKey);
assertThat(fooProvider.getValue("actions")).isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/SwiftConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/SwiftConfigurationTest.java
index 40d88fc..fceed72 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/SwiftConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/SwiftConfigurationTest.java
@@ -21,7 +21,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import java.util.List;
import org.junit.Before;
@@ -41,7 +41,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java
index 2a4820c..ea71293 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeConfigTest.java
@@ -27,8 +27,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
@@ -371,7 +370,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
assertThat(info.getValue("xcode_version"))
.isEqualTo(
@@ -439,7 +438,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
assertThat(info.getValue("xcode_version").toString()).isEqualTo("1.9");
assertThat(info.getValue("min_os").toString()).isEqualTo("1.8");
@@ -946,8 +945,7 @@
"--watchos_minimum_os=4.5");
ConfiguredTarget r = getConfiguredTarget("//x:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
- Label.parseAbsolute("//x:r.bzl", ImmutableMap.of()), "MyInfo");
+ new StarlarkProvider.Key(Label.parseAbsolute("//x:r.bzl", ImmutableMap.of()), "MyInfo");
StructImpl info = (StructImpl) r.get(key);
assertThat(info.getValue("xcode").toString()).isEqualTo("0.0");
@@ -1017,8 +1015,7 @@
useConfiguration("--xcode_version_config=//x:c");
ConfiguredTarget r = getConfiguredTarget("//x:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
- Label.parseAbsolute("//x:r.bzl", ImmutableMap.of()), "MyInfo");
+ new StarlarkProvider.Key(Label.parseAbsolute("//x:r.bzl", ImmutableMap.of()), "MyInfo");
StructImpl info = (StructImpl) r.get(key);
assertThat((Map<?, ?>) info.getValue("execution_info"))
.containsKey(ExecutionRequirements.REQUIRES_DARWIN);
@@ -1080,8 +1077,7 @@
useConfiguration("--xcode_version_config=//x:c");
ConfiguredTarget r = getConfiguredTarget("//x:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
- Label.parseAbsolute("//x:r.bzl", ImmutableMap.of()), "MyInfo");
+ new StarlarkProvider.Key(Label.parseAbsolute("//x:r.bzl", ImmutableMap.of()), "MyInfo");
StructImpl info = (StructImpl) r.get(key);
assertThat(info.getValue("xcode").toString()).isEqualTo("8.4");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeVersionTest.java b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeVersionTest.java
index 663674d..784357b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeVersionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/apple/XcodeVersionTest.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -79,7 +79,7 @@
RuleConfiguredTarget skylarkTarget =
(RuleConfiguredTarget) getConfiguredTarget("//examples/apple_skylark:my_target");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//examples/rule:apple_rules.bzl", ImmutableMap.of()), "MyInfo");
StructImpl myInfo = (StructImpl) skylarkTarget.get(key);
assertThat((String) myInfo.getValue("xcode_version")).isEqualTo("8");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
index 1e3cf1d..d03b78f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.Crosstool.CcToolchainConfig;
import com.google.devtools.build.lib.packages.util.MockCcSupport;
@@ -77,7 +77,7 @@
ConfiguredTarget ct = getConfiguredTarget("//test:target");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//test:rule.bzl", ImmutableMap.of()), "MyInfo");
StructImpl info = (StructImpl) ct.get(key);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
index e69dd60..a62354a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
@@ -35,7 +35,7 @@
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkInfo;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.Crosstool.CcToolchainConfig;
@@ -95,7 +95,7 @@
private static StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget)
throws LabelSyntaxException {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
@@ -171,7 +171,7 @@
// 1. Build without static_link_cpp_runtimes
ConfiguredTarget r = getConfiguredTarget("//a:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.create(r.getLabel().getPackageIdentifier(), "rule.bzl"), "CruleInfo");
SkylarkInfo cruleInfo = (SkylarkInfo) r.get(key);
Depset staticRuntimeLib = (Depset) cruleInfo.getValue("static");
@@ -5822,7 +5822,7 @@
scratchObjectsProvidingRule();
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:foo.bzl", ImmutableMap.of()), "FooInfo");
LibraryToLink fooLibrary =
Iterables.getOnlyElement(
@@ -5843,7 +5843,7 @@
scratchObjectsProvidingRule();
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:foo.bzl", ImmutableMap.of()), "FooInfo");
// Default toolchain is without PIC support, so pic_objects should be None
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
index 7989dd1..08ca059 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoSkylarkApiTest.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar;
import com.google.devtools.build.lib.testutil.TestConstants;
@@ -800,7 +800,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
@SuppressWarnings("unchecked")
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index 46e21dc..58df90b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -28,8 +28,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar;
import com.google.devtools.build.lib.syntax.Depset;
@@ -60,7 +59,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
@@ -312,7 +311,7 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result"));
Depset transitiveRuntimeJars = ((Depset) info.getValue("transitive_runtime_jars"));
@@ -411,7 +410,7 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result"));
JavaRuleOutputJarsProvider outputs = ((JavaRuleOutputJarsProvider) info.getValue("outputs"));
@@ -1061,7 +1060,7 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result"));
assertThat(info.getValue("enabled")).isEqualTo(Boolean.TRUE);
@@ -1122,7 +1121,7 @@
StructImpl info =
(StructImpl)
myConfiguredTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//java/test:extension.bzl", ImmutableMap.of()), "result"));
Depset rawMyCompileJars = (Depset) info.getValue("compile_jars");
@@ -1188,8 +1187,8 @@
ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:r");
ConfiguredTarget javaLibraryTarget = getConfiguredTarget("//foo:jl");
- SkylarkKey myProviderKey =
- new SkylarkKey(
+ StarlarkProvider.Key myProviderKey =
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "my_provider");
StructImpl declaredProvider = (StructImpl) myRuleTarget.get(myProviderKey);
Object javaProvider = declaredProvider.getValue("p");
@@ -1346,7 +1345,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
@SuppressWarnings("unchecked")
Sequence<Artifact> sourceJars = (Sequence<Artifact>) (info.getValue("source_jars"));
@@ -1376,7 +1375,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
Depset sourceJars = (Depset) info.getValue("property");
@@ -1409,7 +1408,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
Depset sourceJars = (Depset) info.getValue("property");
@@ -1442,7 +1441,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
Depset sourceJars = (Depset) info.getValue("property");
@@ -1475,7 +1474,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
Depset exports = (Depset) info.getValue("property");
@@ -1504,7 +1503,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
JavaGenJarsProvider javaGenJarsProvider = (JavaGenJarsProvider) info.getValue("property");
@@ -1534,7 +1533,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//foo:extension.bzl", ImmutableMap.of()), "result"));
JavaCompilationInfoProvider javaCompilationInfoProvider =
@@ -1687,7 +1686,8 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
assertThat(((String) info.getValue("strict_java_deps"))).isEqualTo("default");
}
@@ -1708,7 +1708,8 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
assertThat(((String) info.getValue("strict_java_deps"))).isEqualTo("error");
}
@@ -1792,7 +1793,8 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
Label javaToolchainLabel =
((JavaToolchainProvider)
((ConfiguredTarget) info.getValue("java_toolchain_label"))
@@ -1835,7 +1837,8 @@
StructImpl info =
(StructImpl)
configuredTarget.get(
- new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
Label javaToolchainLabel =
((JavaToolchainProvider)
((ConfiguredTarget) info.getValue("java_toolchain_label"))
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
index dfa49e3..fba3e79 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider;
import com.google.devtools.build.lib.rules.java.JavaCompileAction;
@@ -550,7 +550,7 @@
"foo_rule(name = 'foo_rule', dep = 'foo_java_proto')");
ConfiguredTarget target = getConfiguredTarget("//x:foo_rule");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//x:aspect.bzl", ImmutableMap.of()), "MyInfo");
StructImpl myInfo = (StructImpl) target.get(key);
Boolean result = (Boolean) myInfo.getValue("result");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index 68fc5a1..693e9f8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
@@ -34,7 +34,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.MockObjcSupport;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
@@ -104,7 +104,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java
index b642cca..b44619f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspectTest.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.MockObjcSupport;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
@@ -288,7 +288,7 @@
ConfiguredTarget topTarget = getConfiguredTarget("//bin:link_target");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//test_skylark:top_level_stub.bzl", ImmutableMap.of()), "MyInfo");
StructImpl info = (StructImpl) topTarget.get(key);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
index ccf7ba1..d29b30b 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkInfo;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.apple.AppleToolchain;
import com.google.devtools.build.lib.rules.apple.DottedVersion;
@@ -87,7 +87,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintCollectionApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintCollectionApiTest.java
index 5ac5ea6..faf8790 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintCollectionApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintCollectionApiTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.syntax.Sequence;
import java.util.Collection;
@@ -152,7 +152,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//verify:verify.bzl", ImmutableMap.of()), "result"));
@SuppressWarnings("unchecked")
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java
index de435fe..bc3831c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/ConstraintTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.analysis.platform.PlatformProviderUtils;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.syntax.Starlark;
import org.junit.Before;
@@ -180,7 +180,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//verify:verify.bzl", ImmutableMap.of()), "result"));
@SuppressWarnings("unchecked")
@@ -230,7 +230,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//verify:verify.bzl", ImmutableMap.of()), "result"));
assertThat(info.getValue("default_value")).isEqualTo(Starlark.NONE);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformConfigurationApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformConfigurationApiTest.java
index a0c440b..cc37819 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformConfigurationApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/PlatformConfigurationApiTest.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,7 +54,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//verify:verify.bzl", ImmutableMap.of()), "result"));
Label hostPlatform = (Label) info.getValue("host_platform");
@@ -86,7 +86,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//verify:verify.bzl", ImmutableMap.of()), "result"));
Label targetPlatform = (Label) info.getValue("target_platform");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java
index 541f7a4..12cd208 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoInfoStarlarkApiTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
import com.google.devtools.build.lib.skylarkbuildapi.proto.ProtoCommonApi;
@@ -50,7 +50,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java
index 7e9b60c..9b999cc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyStarlarkTransitionsTest.java
@@ -21,7 +21,7 @@
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import org.junit.Before;
import org.junit.Test;
@@ -105,7 +105,7 @@
private void verifyVersion(String target, PythonVersion version) throws Exception {
ConfiguredTarget configuredTarget = getConfiguredTarget(target);
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
StructImpl myInfo = (StructImpl) configuredTarget.get(key);
ConfiguredTarget wrapped = (ConfiguredTarget) myInfo.getValue("wrapped");
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java
index 0ab6e7e..7c2b1f5 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredAspect;
import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.Mutability;
@@ -62,8 +62,9 @@
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey fooKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
+ StarlarkProvider.Key fooKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
StructImpl fooProvider = (StructImpl) configuredAspect.get(fooKey);
assertThat(fooProvider.getValue("actions")).isNotNull();
@@ -123,8 +124,9 @@
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey fooKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
+ StarlarkProvider.Key fooKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
StructImpl fooProvider = (StructImpl) configuredAspect.get(fooKey);
assertThat(fooProvider.getValue("actions")).isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
index beaf043..c524dae 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java
@@ -37,7 +37,7 @@
import com.google.devtools.build.lib.cmdline.TargetParsingException;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.AspectDefinition;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.util.MockObjcSupport;
import com.google.devtools.build.lib.packages.util.MockProtoSupport;
@@ -105,8 +105,9 @@
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey fooKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
+ StarlarkProvider.Key fooKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
assertThat(configuredAspect.get(fooKey).getProvider().getKey()).isEqualTo(fooKey);
}
@@ -130,10 +131,12 @@
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey fooKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
- SkylarkKey barKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "bar");
+ StarlarkProvider.Key fooKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
+ StarlarkProvider.Key barKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "bar");
assertThat(configuredAspect.get(fooKey).getProvider().getKey()).isEqualTo(fooKey);
assertThat(configuredAspect.get(barKey).getProvider().getKey()).isEqualTo(barKey);
@@ -159,10 +162,12 @@
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey fooKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
- SkylarkKey barKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "bar");
+ StarlarkProvider.Key fooKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "foo");
+ StarlarkProvider.Key barKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "bar");
assertThat(configuredAspect.get(fooKey).getProvider().getKey()).isEqualTo(fooKey);
assertThat(configuredAspect.get(barKey).getProvider().getKey()).isEqualTo(barKey);
@@ -379,7 +384,8 @@
"my_rule = rule(implementation = _rule_impl,",
" attrs = { 'dep' : attr.label(aspects = [MyAspect]) },",
")");
- SkylarkKey providerKey = new SkylarkKey(Label.parseAbsoluteUnchecked("//test:aspect.bzl"), "p");
+ StarlarkProvider.Key providerKey =
+ new StarlarkProvider.Key(Label.parseAbsoluteUnchecked("//test:aspect.bzl"), "p");
scratch.file(
"test/BUILD",
"load('//test:aspect.bzl', 'my_rule')",
@@ -2246,8 +2252,8 @@
AnalysisResult analysisResult = update(ImmutableList.of("//test:aspect.bzl%a3"), "//test:r2_1");
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey p3 =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "p3");
+ StarlarkProvider.Key p3 =
+ new StarlarkProvider.Key(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "p3");
StructImpl p3Provider = (StructImpl) configuredAspect.get(p3);
assertThat((Sequence<?>) p3Provider.getValue("value"))
.containsExactly(
@@ -2309,8 +2315,9 @@
AnalysisResult analysisResult = update(ImmutableList.of(), "//test:rcollect");
ConfiguredTarget configuredTarget =
Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
- SkylarkKey pCollector =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
+ StarlarkProvider.Key pCollector =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl pCollectorProvider = (StructImpl) configuredTarget.get(pCollector);
assertThat((Sequence<?>) pCollectorProvider.getValue("result"))
.containsExactly("//test:r1", "//test:r0", "//test:r0+PAspect");
@@ -2348,8 +2355,9 @@
update(ImmutableList.of("//test:aspect.bzl%acollect"), "//test:baz");
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey pCollector =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
+ StarlarkProvider.Key pCollector =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
assertThat(collector.getValue("aspect_attr"))
.isEqualTo(Label.parseAbsolute("//test:foo", ImmutableMap.of()));
@@ -2391,8 +2399,9 @@
update(ImmutableList.of("//test:aspect.bzl%acollect"), "//test:baz");
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey pCollector =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
+ StarlarkProvider.Key pCollector =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
assertThat(collector.getValue("attr_value")).isEqualTo(30);
}
@@ -2445,8 +2454,9 @@
update(ImmutableList.of("//test:aspect.bzl%acollect"), "//test:quux");
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey pCollector =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
+ StarlarkProvider.Key pCollector =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
assertThat(collector.getValue("attr_value")).isEqualTo(30);
}
@@ -2485,8 +2495,9 @@
update(ImmutableList.of("//test:aspect.bzl%acollect"), "//test:baz");
ConfiguredAspect configuredAspect =
Iterables.getOnlyElement(analysisResult.getAspects()).getConfiguredAspect();
- SkylarkKey pCollector =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
+ StarlarkProvider.Key pCollector =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
assertThat(((Depset) collector.getValue("visited")).toCollection())
.containsExactly(
@@ -2639,8 +2650,9 @@
ConfiguredAspect configuredAspect = aspectValue.getConfiguredAspect();
assertThat(configuredAspect).isNotNull();
- SkylarkKey myInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "MyInfo");
+ StarlarkProvider.Key myInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "MyInfo");
StructImpl myInfo = (StructImpl) configuredAspect.get(myInfoKey);
assertThat(myInfo.getValue("hidden_attr_label")).isEqualTo("//test:zzz");
}
@@ -2787,8 +2799,9 @@
useConfiguration("--experimental_aspect_output_propagation=true");
- SkylarkKey rootInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootInfo");
+ StarlarkProvider.Key rootInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootInfo");
AnalysisResult analysisResultWithFiles = update("//test:test_with_files");
ConfiguredTarget targetWithFiles =
@@ -2900,10 +2913,12 @@
setupAspectOnAspectTargetGraph(
/* applyRootToGeneratingRules= */ true, /* applyDepToGeneratingRules= */ true);
- SkylarkKey rootInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
- SkylarkKey depInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
+ StarlarkProvider.Key rootInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
+ StarlarkProvider.Key depInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
AnalysisResult analysisResult = update("//test:test");
ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
@@ -2928,10 +2943,12 @@
setupAspectOnAspectTargetGraph(
/* applyRootToGeneratingRules= */ false, /* applyDepToGeneratingRules= */ false);
- SkylarkKey rootInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
- SkylarkKey depInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
+ StarlarkProvider.Key rootInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
+ StarlarkProvider.Key depInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
AnalysisResult analysisResult = update("//test:test");
ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
@@ -2950,10 +2967,12 @@
setupAspectOnAspectTargetGraph(
/* applyRootToGeneratingRules= */ true, /* applyDepToGeneratingRules= */ false);
- SkylarkKey rootInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
- SkylarkKey depInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
+ StarlarkProvider.Key rootInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
+ StarlarkProvider.Key depInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
AnalysisResult analysisResult = update("//test:test");
ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
@@ -2975,10 +2994,12 @@
setupAspectOnAspectTargetGraph(
/* applyRootToGeneratingRules= */ false, /* applyDepToGeneratingRules= */ true);
- SkylarkKey rootInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
- SkylarkKey depInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
+ StarlarkProvider.Key rootInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "RootAspectInfo");
+ StarlarkProvider.Key depInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:lib.bzl", ImmutableMap.of()), "DepAspectInfo");
AnalysisResult analysisResult = update("//test:test");
ConfiguredTarget target = Iterables.getOnlyElement(analysisResult.getTargetsToBuild());
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
index a421ad0..959a013 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -47,8 +47,7 @@
import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
import com.google.devtools.build.lib.packages.BuildSetting;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.rules.objc.ObjcProvider;
@@ -86,7 +85,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
@@ -1322,7 +1321,7 @@
ConfiguredTarget configuredTarget = getConfiguredTarget("//test:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.create(configuredTarget.getLabel().getPackageIdentifier(), "extension.bzl"),
"my_provider");
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
@@ -1347,7 +1346,7 @@
ConfiguredTarget configuredTarget = getConfiguredTarget("//test:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.create(configuredTarget.getLabel().getPackageIdentifier(), "extension.bzl"),
"my_provider");
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
@@ -1373,7 +1372,7 @@
ConfiguredTarget configuredTarget = getConfiguredTarget("//test:r");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.create(configuredTarget.getLabel().getPackageIdentifier(), "extension.bzl"),
"my_provider");
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
@@ -1822,8 +1821,9 @@
"my_dep_rule(name = 'yyy', dep = ':xxx')"
);
- SkylarkKey pInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:rule.bzl", ImmutableMap.of()), "PInfo");
+ StarlarkProvider.Key pInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:rule.bzl", ImmutableMap.of()), "PInfo");
ConfiguredTarget targetXXX = getConfiguredTarget("//test:xxx");
StructImpl structXXX = (StructImpl) targetXXX.get(pInfoKey);
@@ -2177,10 +2177,12 @@
"inner_rule(name = 'inner')",
"outer_rule_test(name = 'r', dep = ':inner')");
- SkylarkKey myInfoKey =
- new SkylarkKey(Label.parseAbsolute("//test:extension.bzl", ImmutableMap.of()), "MyInfo");
- SkylarkKey myDepKey =
- new SkylarkKey(Label.parseAbsolute("//test:extension.bzl", ImmutableMap.of()), "MyDep");
+ StarlarkProvider.Key myInfoKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:extension.bzl", ImmutableMap.of()), "MyInfo");
+ StarlarkProvider.Key myDepKey =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:extension.bzl", ImmutableMap.of()), "MyDep");
ConfiguredTarget outerTarget = getConfiguredTarget("//test:r");
StructImpl outerInfo = (StructImpl) outerTarget.get(myInfoKey);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index e71988c..57d3720 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -43,7 +43,7 @@
import com.google.devtools.build.lib.packages.SkylarkAspectClass;
import com.google.devtools.build.lib.packages.SkylarkDefinedAspect;
import com.google.devtools.build.lib.packages.SkylarkInfo;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.packages.StructProvider;
@@ -300,8 +300,7 @@
}
private static StarlarkProviderIdentifier declared(String exportedName) {
- return StarlarkProviderIdentifier.forKey(
- new SkylarkProvider.SkylarkKey(FAKE_LABEL, exportedName));
+ return StarlarkProviderIdentifier.forKey(new StarlarkProvider.Key(FAKE_LABEL, exportedName));
}
@Test
@@ -1370,13 +1369,12 @@
);
assertThat(lookup("d_x")).isEqualTo(1);
assertThat(lookup("d_y")).isEqualTo("abc");
- SkylarkProvider dataConstructor = (SkylarkProvider) lookup("data");
+ StarlarkProvider dataConstructor = (StarlarkProvider) lookup("data");
StructImpl data = (StructImpl) lookup("d");
assertThat(data.getProvider()).isEqualTo(dataConstructor);
assertThat(dataConstructor.isExported()).isTrue();
assertThat(dataConstructor.getPrintableName()).isEqualTo("data");
- assertThat(dataConstructor.getKey())
- .isEqualTo(new SkylarkProvider.SkylarkKey(FAKE_LABEL, "data"));
+ assertThat(dataConstructor.getKey()).isEqualTo(new StarlarkProvider.Key(FAKE_LABEL, "data"));
}
@Test
@@ -1391,7 +1389,7 @@
);
assertThat(lookup("x")).isEqualTo(1);
assertThat(lookup("y")).isEqualTo("abc");
- SkylarkProvider dataConstructor = (SkylarkProvider) lookup("data");
+ StarlarkProvider dataConstructor = (StarlarkProvider) lookup("data");
StructImpl dx = (StructImpl) lookup("dx");
assertThat(dx.getProvider()).isEqualTo(dataConstructor);
StructImpl dy = (StructImpl) lookup("dy");
@@ -1615,13 +1613,13 @@
" provider() ]",
"]"
);
- SkylarkProvider p = (SkylarkProvider) lookup("p");
+ StarlarkProvider p = (StarlarkProvider) lookup("p");
SkylarkDefinedAspect a = (SkylarkDefinedAspect) lookup("a");
- SkylarkProvider p1 = (SkylarkProvider) lookup("p1");
+ StarlarkProvider p1 = (StarlarkProvider) lookup("p1");
assertThat(p.getPrintableName()).isEqualTo("p");
- assertThat(p.getKey()).isEqualTo(new SkylarkProvider.SkylarkKey(FAKE_LABEL, "p"));
+ assertThat(p.getKey()).isEqualTo(new StarlarkProvider.Key(FAKE_LABEL, "p"));
assertThat(p1.getPrintableName()).isEqualTo("p1");
- assertThat(p1.getKey()).isEqualTo(new SkylarkProvider.SkylarkKey(FAKE_LABEL, "p1"));
+ assertThat(p1.getKey()).isEqualTo(new StarlarkProvider.Key(FAKE_LABEL, "p1"));
assertThat(a.getAspectClass()).isEqualTo(
new SkylarkAspectClass(FAKE_LABEL, "a")
);
@@ -1633,11 +1631,11 @@
"p = provider()",
"p1 = p"
);
- SkylarkProvider p = (SkylarkProvider) lookup("p");
- SkylarkProvider p1 = (SkylarkProvider) lookup("p1");
+ StarlarkProvider p = (StarlarkProvider) lookup("p");
+ StarlarkProvider p1 = (StarlarkProvider) lookup("p1");
assertThat(p).isEqualTo(p1);
- assertThat(p.getKey()).isEqualTo(new SkylarkProvider.SkylarkKey(FAKE_LABEL, "p"));
- assertThat(p1.getKey()).isEqualTo(new SkylarkProvider.SkylarkKey(FAKE_LABEL, "p"));
+ assertThat(p.getKey()).isEqualTo(new StarlarkProvider.Key(FAKE_LABEL, "p"));
+ assertThat(p1.getKey()).isEqualTo(new StarlarkProvider.Key(FAKE_LABEL, "p"));
}
@Test
@@ -1648,7 +1646,7 @@
"x = p1.x",
"y = p1.y"
);
- SkylarkProvider p = (SkylarkProvider) lookup("p");
+ StarlarkProvider p = (StarlarkProvider) lookup("p");
SkylarkInfo p1 = (SkylarkInfo) lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
@@ -1664,7 +1662,7 @@
"x = p1.x",
"y = p1.y"
);
- SkylarkProvider p = (SkylarkProvider) lookup("p");
+ StarlarkProvider p = (StarlarkProvider) lookup("p");
SkylarkInfo p1 = (SkylarkInfo) lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
@@ -1679,7 +1677,7 @@
"p1 = p(y = 2)",
"y = p1.y"
);
- SkylarkProvider p = (SkylarkProvider) lookup("p");
+ StarlarkProvider p = (StarlarkProvider) lookup("p");
SkylarkInfo p1 = (SkylarkInfo) lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
index a8dad58..e4309a2 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -42,8 +42,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkInfo;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.java.JavaInfo;
@@ -2535,8 +2534,9 @@
"a(name='a', value={'c': 'c', 'b': 'b', 'a': 'a', 'f': 'f', 'e': 'e', 'd': 'd'})");
ConfiguredTarget a = getConfiguredTarget("//a");
- SkylarkKey key =
- new SkylarkKey(Label.parseAbsolute("//a:a.bzl", ImmutableMap.of()), "key_provider");
+ StarlarkProvider.Key key =
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//a:a.bzl", ImmutableMap.of()), "key_provider");
SkylarkInfo keyInfo = (SkylarkInfo) a.get(key);
Sequence<?> keys = (Sequence) keyInfo.getValue("keys");
@@ -2568,7 +2568,7 @@
ConfiguredTarget buildSetting = getConfiguredTarget("//test:int_flag");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.create(buildSetting.getLabel().getPackageIdentifier(), "build_setting.bzl"),
"BuildSettingInfo");
StructImpl buildSettingInfo = (StructImpl) buildSetting.get(key);
@@ -2582,7 +2582,7 @@
ConfiguredTarget buildSetting = getConfiguredTarget("//test:int_flag");
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.create(buildSetting.getLabel().getPackageIdentifier(), "build_setting.bzl"),
"BuildSettingInfo");
StructImpl buildSettingInfo = (StructImpl) buildSetting.get(key);
@@ -2689,7 +2689,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//rule:test_rule.bzl", ImmutableMap.of()), "result"));
assertThat(info).isNotNull();
@@ -2753,7 +2753,7 @@
StructImpl info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//demo:test_rule.bzl", ImmutableMap.of()), "result"));
assertThat(info).isNotNull();
@@ -2766,7 +2766,7 @@
info =
(StructImpl)
myRuleTarget.get(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//demo:test_rule.bzl", ImmutableMap.of()), "result"));
assertThat(info).isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 77bdd6d..737c22d 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -51,8 +51,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.packages.Provider;
-import com.google.devtools.build.lib.packages.SkylarkProvider;
-import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
+import com.google.devtools.build.lib.packages.StarlarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.skylark.util.SkylarkTestCase;
import com.google.devtools.build.lib.skylarkinterface.Param;
@@ -175,7 +174,7 @@
private StructImpl getMyInfoFromTarget(ConfiguredTarget configuredTarget) throws Exception {
Provider.Key key =
- new SkylarkProvider.SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//myinfo:myinfo.bzl", ImmutableMap.of()), "MyInfo");
return (StructImpl) configuredTarget.get(key);
}
@@ -279,7 +278,8 @@
action.getArguments(), "-c", "dummy_command", "", "--a", "--b");
assertThat(action.getMnemonic()).isEqualTo("DummyMnemonic");
assertThat(action.getProgressMessage()).isEqualTo("dummy_message");
- assertThat(action.getIncompleteEnvironmentForTesting()).isEqualTo(targetConfig.getLocalShellEnvironment());
+ assertThat(action.getIncompleteEnvironmentForTesting())
+ .isEqualTo(targetConfig.getLocalShellEnvironment());
}
@Test
@@ -1349,7 +1349,7 @@
assertThat(provider).isInstanceOf(StructImpl.class);
assertThat(((StructImpl) provider).getProvider().getKey())
.isEqualTo(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "foo_provider"));
}
@@ -1392,7 +1392,8 @@
assertThat(provider).isInstanceOf(StructImpl.class);
assertThat(((StructImpl) provider).getProvider().getKey())
.isEqualTo(
- new SkylarkKey(Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "FooInfo"));
+ new StarlarkProvider.Key(
+ Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "FooInfo"));
}
@Test
@@ -1511,7 +1512,7 @@
assertThat(provider).isInstanceOf(StructImpl.class);
assertThat(((StructImpl) provider).getProvider().getKey())
.isEqualTo(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "foo_provider"));
assertThat(((StructImpl) provider).getValue("a")).isEqualTo(123);
}
@@ -1560,7 +1561,7 @@
assertThat(provider).isInstanceOf(StructImpl.class);
assertThat(((StructImpl) provider).getProvider().getKey())
.isEqualTo(
- new SkylarkKey(
+ new StarlarkProvider.Key(
Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "foo_provider"));
}
