The great Skylark -> Starlark class migration:
SkylarkRuleClassSerializer
SkylarkProviderIdentifierCodecTest
SkylarkProviderIdentifier
Rough algorithm:
- Convert these class names
- Convert methods, variables, other symbols encountered in the files these
classes are defined in.
- *Don't* replace class names for classes defined in other files. These will
be handled in their own order. This helps keep individual changelist scope
small.
PiperOrigin-RevId: 307063447
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java b/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
index 3eb97a9..cbbf93b 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
@@ -35,28 +35,27 @@
public final class AdvertisedProviderSet {
private final boolean canHaveAnyProvider;
private final ImmutableSet<Class<?>> nativeProviders;
- private final ImmutableSet<SkylarkProviderIdentifier> skylarkProviders;
+ private final ImmutableSet<StarlarkProviderIdentifier> skylarkProviders;
- private AdvertisedProviderSet(boolean canHaveAnyProvider,
+ private AdvertisedProviderSet(
+ boolean canHaveAnyProvider,
ImmutableSet<Class<?>> nativeProviders,
- ImmutableSet<SkylarkProviderIdentifier> skylarkProviders) {
+ ImmutableSet<StarlarkProviderIdentifier> skylarkProviders) {
this.canHaveAnyProvider = canHaveAnyProvider;
this.nativeProviders = nativeProviders;
this.skylarkProviders = skylarkProviders;
}
public static final AdvertisedProviderSet ANY =
- new AdvertisedProviderSet(true,
- ImmutableSet.<Class<?>>of(),
- ImmutableSet.<SkylarkProviderIdentifier>of());
+ new AdvertisedProviderSet(
+ true, ImmutableSet.<Class<?>>of(), ImmutableSet.<StarlarkProviderIdentifier>of());
public static final AdvertisedProviderSet EMPTY =
- new AdvertisedProviderSet(false,
- ImmutableSet.<Class<?>>of(),
- ImmutableSet.<SkylarkProviderIdentifier>of());
+ new AdvertisedProviderSet(
+ false, ImmutableSet.<Class<?>>of(), ImmutableSet.<StarlarkProviderIdentifier>of());
public static AdvertisedProviderSet create(
ImmutableSet<Class<?>> nativeProviders,
- ImmutableSet<SkylarkProviderIdentifier> skylarkProviders) {
+ ImmutableSet<StarlarkProviderIdentifier> skylarkProviders) {
if (nativeProviders.isEmpty() && skylarkProviders.isEmpty()) {
return EMPTY;
}
@@ -110,7 +109,7 @@
}
/** Get all advertised Starlark providers. */
- public ImmutableSet<SkylarkProviderIdentifier> getSkylarkProviders() {
+ public ImmutableSet<StarlarkProviderIdentifier> getSkylarkProviders() {
return skylarkProviders;
}
@@ -133,7 +132,7 @@
* Returns {@code true} if this provider set can have any provider, or if it advertises the
* specific Starlark provider requested.
*/
- public boolean advertises(SkylarkProviderIdentifier skylarkProvider) {
+ public boolean advertises(StarlarkProviderIdentifier skylarkProvider) {
if (canHaveAnyProvider()) {
return true;
}
@@ -144,7 +143,8 @@
public static class Builder {
private boolean canHaveAnyProvider;
private final ArrayList<Class<?>> nativeProviders;
- private final ArrayList<SkylarkProviderIdentifier> skylarkProviders;
+ private final ArrayList<StarlarkProviderIdentifier> skylarkProviders;
+
private Builder() {
nativeProviders = new ArrayList<>();
skylarkProviders = new ArrayList<>();
@@ -182,17 +182,17 @@
}
public Builder addSkylark(String providerName) {
- skylarkProviders.add(SkylarkProviderIdentifier.forLegacy(providerName));
+ skylarkProviders.add(StarlarkProviderIdentifier.forLegacy(providerName));
return this;
}
- public Builder addSkylark(SkylarkProviderIdentifier id) {
+ public Builder addSkylark(StarlarkProviderIdentifier id) {
skylarkProviders.add(id);
return this;
}
public Builder addSkylark(Provider.Key id) {
- skylarkProviders.add(SkylarkProviderIdentifier.forKey(id));
+ skylarkProviders.add(StarlarkProviderIdentifier.forKey(id));
return this;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
index 6aaa10e..107bf7c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDefinition.java
@@ -276,14 +276,14 @@
* Asserts that this aspect can only be evaluated for rules that supply all of the specified
* Starlark providers.
*/
- public Builder requireSkylarkProviders(SkylarkProviderIdentifier... skylarkProviders) {
+ public Builder requireSkylarkProviders(StarlarkProviderIdentifier... skylarkProviders) {
requiredProviders.addSkylarkSet(ImmutableSet.copyOf(skylarkProviders));
return this;
}
public Builder requireAspectsWithProviders(
- Iterable<ImmutableSet<SkylarkProviderIdentifier>> providerSets) {
- for (ImmutableSet<SkylarkProviderIdentifier> providerSet : providerSets) {
+ Iterable<ImmutableSet<StarlarkProviderIdentifier>> providerSets) {
+ for (ImmutableSet<StarlarkProviderIdentifier> providerSet : providerSets) {
if (!providerSet.isEmpty()) {
requiredAspectProviders.addSkylarkSet(providerSet);
}
@@ -307,11 +307,9 @@
return this;
}
- /**
- * State that the aspect being built provides given providers.
- */
- public Builder advertiseProvider(ImmutableList<SkylarkProviderIdentifier> providers) {
- for (SkylarkProviderIdentifier provider : providers) {
+ /** State that the aspect being built provides given providers. */
+ public Builder advertiseProvider(ImmutableList<StarlarkProviderIdentifier> providers) {
+ for (StarlarkProviderIdentifier provider : providers) {
advertisedProviders.addSkylark(provider);
}
return this;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index c8171c5..a91d460 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -974,10 +974,10 @@
* of {@link #allowedRuleClasses}, otherwise an error is produced during the analysis phase.
*/
public Builder<TYPE> mandatoryProvidersList(
- Iterable<? extends Iterable<SkylarkProviderIdentifier>> providersList) {
+ Iterable<? extends Iterable<StarlarkProviderIdentifier>> providersList) {
Preconditions.checkState(type.getLabelClass() == LabelClass.DEPENDENCY,
"must be a label-valued type");
- for (Iterable<SkylarkProviderIdentifier> providers : providersList) {
+ for (Iterable<StarlarkProviderIdentifier> providers : providersList) {
this.requiredProvidersBuilder.addSkylarkSet(ImmutableSet.copyOf(providers));
}
return this;
@@ -989,18 +989,18 @@
Arrays.asList(ids),
s -> {
Preconditions.checkNotNull(s);
- return SkylarkProviderIdentifier.forLegacy(s);
+ return StarlarkProviderIdentifier.forLegacy(s);
}));
}
- public Builder<TYPE> mandatoryProviders(Iterable<SkylarkProviderIdentifier> providers) {
+ public Builder<TYPE> mandatoryProviders(Iterable<StarlarkProviderIdentifier> providers) {
if (providers.iterator().hasNext()) {
mandatoryProvidersList(ImmutableList.of(providers));
}
return this;
}
- public Builder<TYPE> mandatoryProviders(SkylarkProviderIdentifier... providers) {
+ public Builder<TYPE> mandatoryProviders(StarlarkProviderIdentifier... providers) {
mandatoryProviders(Arrays.asList(providers));
return this;
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java b/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
index 4a96dad..16c0892 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
@@ -99,10 +99,8 @@
throw Starlark.errorf("'%s' cannot be constructed from Starlark", getPrintableName());
}
- /**
- * Returns the identifier of this provider.
- */
- public SkylarkProviderIdentifier id() {
- return SkylarkProviderIdentifier.forKey(getKey());
+ /** Returns the identifier of this provider. */
+ public StarlarkProviderIdentifier id() {
+ return StarlarkProviderIdentifier.forKey(getKey());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java b/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java
index ce5af71..057b6bc 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java
@@ -68,8 +68,8 @@
String.format("'%s' value has no field or method '%%s'", name);
}
- public final SkylarkProviderIdentifier id() {
- return SkylarkProviderIdentifier.forKey(getKey());
+ public final StarlarkProviderIdentifier id() {
+ return StarlarkProviderIdentifier.forKey(getKey());
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java b/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java
index 9af7ae2..73f3023 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java
@@ -50,10 +50,9 @@
*/
private final ImmutableList<ImmutableSet<Class<?>>> nativeProviders;
/**
- * Sets of native providers.
- * If non-empty, {@link #constraint} is {@link Constraint#RESTRICTED}
+ * Sets of native providers. If non-empty, {@link #constraint} is {@link Constraint#RESTRICTED}
*/
- private final ImmutableList<ImmutableSet<SkylarkProviderIdentifier>> skylarkProviders;
+ private final ImmutableList<ImmutableSet<StarlarkProviderIdentifier>> skylarkProviders;
public String getDescription() {
return constraint.getDescription(this);
@@ -80,7 +79,7 @@
@Override
public boolean satisfies(
Predicate<Class<?>> hasNativeProvider,
- Predicate<SkylarkProviderIdentifier> hasSkylarkProvider,
+ Predicate<StarlarkProviderIdentifier> hasSkylarkProvider,
RequiredProviders requiredProviders,
Builder missingProviders) {
return true;
@@ -109,7 +108,7 @@
@Override
public boolean satisfies(
Predicate<Class<?>> hasNativeProvider,
- Predicate<SkylarkProviderIdentifier> hasSkylarkProvider,
+ Predicate<StarlarkProviderIdentifier> hasSkylarkProvider,
RequiredProviders requiredProviders,
Builder missingProviders) {
return false;
@@ -146,7 +145,7 @@
@Override
public boolean satisfies(
Predicate<Class<?>> hasNativeProvider,
- Predicate<SkylarkProviderIdentifier> hasSkylarkProvider,
+ Predicate<StarlarkProviderIdentifier> hasSkylarkProvider,
RequiredProviders requiredProviders,
Builder missingProviders) {
for (ImmutableSet<Class<?>> nativeProviderSet : requiredProviders.nativeProviders) {
@@ -164,8 +163,8 @@
}
}
- for (ImmutableSet<SkylarkProviderIdentifier> skylarkProviderSet
- : requiredProviders.skylarkProviders) {
+ for (ImmutableSet<StarlarkProviderIdentifier> skylarkProviderSet :
+ requiredProviders.skylarkProviders) {
if (skylarkProviderSet.stream().allMatch(hasSkylarkProvider)) {
return true;
}
@@ -187,7 +186,7 @@
for (ImmutableSet<Class<?>> nativeProviderSet : providers.nativeProviders) {
result.addNativeSet(nativeProviderSet);
}
- for (ImmutableSet<SkylarkProviderIdentifier> skylarkProviderSet :
+ for (ImmutableSet<StarlarkProviderIdentifier> skylarkProviderSet :
providers.skylarkProviders) {
result.addSkylarkSet(skylarkProviderSet);
}
@@ -215,7 +214,7 @@
*/
abstract boolean satisfies(
Predicate<Class<?>> hasNativeProvider,
- Predicate<SkylarkProviderIdentifier> hasSkylarkProvider,
+ Predicate<StarlarkProviderIdentifier> hasSkylarkProvider,
RequiredProviders requiredProviders,
@Nullable Builder missingProviders);
@@ -231,12 +230,12 @@
}
/**
- * Checks if a set of providers encoded by predicates {@code hasNativeProviders}
- * and {@code hasSkylarkProvider} satisfies this {@code RequiredProviders} instance.
+ * Checks if a set of providers encoded by predicates {@code hasNativeProviders} and {@code
+ * hasSkylarkProvider} satisfies this {@code RequiredProviders} instance.
*/
public boolean isSatisfiedBy(
Predicate<Class<?>> hasNativeProvider,
- Predicate<SkylarkProviderIdentifier> hasSkylarkProvider) {
+ Predicate<StarlarkProviderIdentifier> hasSkylarkProvider) {
return constraint.satisfies(hasNativeProvider, hasSkylarkProvider, this, null);
}
@@ -246,7 +245,7 @@
*/
public RequiredProviders getMissing(
Predicate<Class<?>> hasNativeProvider,
- Predicate<SkylarkProviderIdentifier> hasSkylarkProvider) {
+ Predicate<StarlarkProviderIdentifier> hasSkylarkProvider) {
Builder builder = acceptAnyBuilder();
if (constraint.satisfies(hasNativeProvider, hasSkylarkProvider, this, builder)) {
// Ignore all collected missing providers.
@@ -277,7 +276,7 @@
RequiredProviders(
Constraint constraint,
ImmutableList<ImmutableSet<Class<?>>> nativeProviders,
- ImmutableList<ImmutableSet<SkylarkProviderIdentifier>> skylarkProviders) {
+ ImmutableList<ImmutableSet<StarlarkProviderIdentifier>> skylarkProviders) {
this.constraint = constraint;
Preconditions.checkState(constraint.equals(Constraint.RESTRICTED)
@@ -347,7 +346,7 @@
/** A builder for {@link RequiredProviders} */
public static class Builder {
private final ImmutableList.Builder<ImmutableSet<Class<?>>> nativeProviders;
- private final ImmutableList.Builder<ImmutableSet<SkylarkProviderIdentifier>> skylarkProviders;
+ private final ImmutableList.Builder<ImmutableSet<StarlarkProviderIdentifier>> skylarkProviders;
private Constraint constraint;
private Builder(boolean acceptNone) {
@@ -362,7 +361,7 @@
* <p>If all of these providers are present in the dependency, the dependency satisfies {@link
* RequiredProviders}.
*/
- public Builder addSkylarkSet(ImmutableSet<SkylarkProviderIdentifier> skylarkProviderSet) {
+ public Builder addSkylarkSet(ImmutableSet<StarlarkProviderIdentifier> skylarkProviderSet) {
constraint = Constraint.RESTRICTED;
Preconditions.checkState(!skylarkProviderSet.isEmpty());
this.skylarkProviders.add(skylarkProviderSet);
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index d798b89..72f5f1c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -628,7 +628,7 @@
* Name of default attribute implicitly added to all Starlark RuleClasses that are {@code
* build_setting}s.
*/
- public static final String SKYLARK_BUILD_SETTING_DEFAULT_ATTR_NAME = "build_setting_default";
+ public static final String STARLARK_BUILD_SETTING_DEFAULT_ATTR_NAME = "build_setting_default";
public static final String BUILD_SETTING_DEFAULT_NONCONFIGURABLE =
"Build setting defaults are referenced during analysis.";
@@ -650,13 +650,13 @@
private String name;
private ImmutableList<StarlarkThread.CallStackEntry> callstack = ImmutableList.of();
private final RuleClassType type;
- private final boolean skylark;
- private boolean skylarkTestable = false;
+ private final boolean starlark;
+ private boolean starlarkTestable = false;
private boolean documented;
private boolean publicByDefault = false;
private boolean binaryOutput = true;
private boolean workspaceOnly = false;
- private boolean isExecutableSkylark = false;
+ private boolean isExecutableStarlark = false;
private boolean isAnalysisTest = false;
private boolean hasAnalysisTestTransition = false;
private boolean hasFunctionTransitionWhitelist = false;
@@ -720,20 +720,20 @@
private final Map<String, ExecGroup> execGroups = new HashMap<>();
/**
- * Constructs a new {@code RuleClassBuilder} using all attributes from all
- * parent rule classes. An attribute cannot exist in more than one parent.
+ * Constructs a new {@code RuleClassBuilder} using all attributes from all parent rule classes.
+ * An attribute cannot exist in more than one parent.
*
- * <p>The rule type affects the allowed names and the required
- * attributes (see {@link RuleClassType}).
+ * <p>The rule type affects the allowed names and the required attributes (see {@link
+ * RuleClassType}).
*
- * @throws IllegalArgumentException if an attribute with the same name exists
- * in more than one parent
+ * @throws IllegalArgumentException if an attribute with the same name exists in more than one
+ * parent
*/
- public Builder(String name, RuleClassType type, boolean skylark, RuleClass... parents) {
+ public Builder(String name, RuleClassType type, boolean starlark, RuleClass... parents) {
this.name = name;
- this.skylark = skylark;
+ this.starlark = starlark;
this.type = type;
- Preconditions.checkState(skylark || type != RuleClassType.PLACEHOLDER, name);
+ Preconditions.checkState(starlark || type != RuleClassType.PLACEHOLDER, name);
this.documented = type != RuleClassType.ABSTRACT;
for (RuleClass parent : parents) {
if (parent.getValidityPredicate() != PredicatesWithMessage.<Rule>alwaysTrue()) {
@@ -812,9 +812,9 @@
configuredTargetFactory,
configuredTargetFunction);
if (!workspaceOnly) {
- if (skylark) {
- assertSkylarkRuleClassHasImplementationFunction();
- assertSkylarkRuleClassHasEnvironmentLabel();
+ if (starlark) {
+ assertStarlarkRuleClassHasImplementationFunction();
+ assertStarlarkRuleClassHasEnvironmentLabel();
}
Preconditions.checkState(externalBindingsFunction == NO_EXTERNAL_BINDINGS);
}
@@ -825,7 +825,7 @@
if (buildSetting != null) {
Type<?> type = buildSetting.getType();
Attribute.Builder<?> attrBuilder =
- attr(SKYLARK_BUILD_SETTING_DEFAULT_ATTR_NAME, type)
+ attr(STARLARK_BUILD_SETTING_DEFAULT_ATTR_NAME, type)
.nonconfigurable(BUILD_SETTING_DEFAULT_NONCONFIGURABLE)
.mandatory();
if (BuildType.isLabelType(type)) {
@@ -844,13 +844,13 @@
callstack,
key,
type,
- skylark,
- skylarkTestable,
+ starlark,
+ starlarkTestable,
documented,
publicByDefault,
binaryOutput,
workspaceOnly,
- isExecutableSkylark,
+ isExecutableStarlark,
isAnalysisTest,
hasAnalysisTestTransition,
hasFunctionTransitionWhitelist,
@@ -902,7 +902,7 @@
ruleClassType.checkAttributes(attributes);
}
- private void assertSkylarkRuleClassHasImplementationFunction() {
+ private void assertStarlarkRuleClassHasImplementationFunction() {
Preconditions.checkState(
(type == RuleClassType.NORMAL || type == RuleClassType.TEST)
== (configuredTargetFunction != null),
@@ -911,7 +911,7 @@
configuredTargetFunction);
}
- private void assertSkylarkRuleClassHasEnvironmentLabel() {
+ private void assertStarlarkRuleClassHasEnvironmentLabel() {
Preconditions.checkState(
(type == RuleClassType.NORMAL
|| type == RuleClassType.TEST
@@ -960,7 +960,7 @@
* <p>In contrast to {@link #requiresConfigurationFragments(Class...)}, this method takes the
* Starlark module names of fragments instead of their classes.
*/
- public Builder requiresConfigurationFragmentsBySkylarkModuleName(
+ public Builder requiresConfigurationFragmentsByStarlarkModuleName(
Collection<String> configurationFragmentNames) {
configurationFragmentPolicy
.requiresConfigurationFragmentsBySkylarkModuleName(configurationFragmentNames);
@@ -985,7 +985,7 @@
*
* <p>The value is inherited by subclasses.
*/
- public Builder requiresConfigurationFragmentsBySkylarkModuleName(
+ public Builder requiresConfigurationFragmentsByStarlarkModuleName(
ConfigurationTransition transition, Collection<String> configurationFragmentNames) {
configurationFragmentPolicy.requiresConfigurationFragmentsBySkylarkModuleName(transition,
configurationFragmentNames);
@@ -998,9 +998,9 @@
return this;
}
- public Builder setSkylarkTestable() {
- Preconditions.checkState(skylark, "Cannot set skylarkTestable on a non-Starlark rule");
- skylarkTestable = true;
+ public Builder setStarlarkTestable() {
+ Preconditions.checkState(starlark, "Cannot set starlarkTestable on a non-Starlark rule");
+ starlarkTestable = true;
return this;
}
@@ -1145,9 +1145,9 @@
return this;
}
- public Builder advertiseSkylarkProvider(SkylarkProviderIdentifier... skylarkProviders) {
- for (SkylarkProviderIdentifier skylarkProviderIdentifier : skylarkProviders) {
- advertisedProviders.addSkylark(skylarkProviderIdentifier);
+ public Builder advertiseStarlarkProvider(StarlarkProviderIdentifier... starlarkProviders) {
+ for (StarlarkProviderIdentifier starlarkProviderIdentifier : starlarkProviders) {
+ advertisedProviders.addSkylark(starlarkProviderIdentifier);
}
return this;
}
@@ -1279,8 +1279,8 @@
* This rule class outputs a default executable for every rule with the same name as the
* rules's. Only works for Starlark.
*/
- public <TYPE> Builder setExecutableSkylark() {
- this.isExecutableSkylark = true;
+ public <TYPE> Builder setExecutableStarlark() {
+ this.isExecutableStarlark = true;
return this;
}
@@ -1497,13 +1497,13 @@
private final String targetKind;
private final RuleClassType type;
- private final boolean isSkylark;
- private final boolean skylarkTestable;
+ private final boolean isStarlark;
+ private final boolean starlarkTestable;
private final boolean documented;
private final boolean publicByDefault;
private final boolean binaryOutput;
private final boolean workspaceOnly;
- private final boolean isExecutableSkylark;
+ private final boolean isExecutableStarlark;
private final boolean isAnalysisTest;
private final boolean hasAnalysisTestTransition;
private final boolean hasFunctionTransitionWhitelist;
@@ -1631,13 +1631,13 @@
ImmutableList<StarlarkThread.CallStackEntry> callstack,
String key,
RuleClassType type,
- boolean isSkylark,
- boolean skylarkTestable,
+ boolean isStarlark,
+ boolean starlarkTestable,
boolean documented,
boolean publicByDefault,
boolean binaryOutput,
boolean workspaceOnly,
- boolean isExecutableSkylark,
+ boolean isExecutableStarlark,
boolean isAnalysisTest,
boolean hasAnalysisTestTransition,
boolean hasFunctionTransitionWhitelist,
@@ -1667,9 +1667,9 @@
this.callstack = callstack;
this.key = key;
this.type = type;
- this.isSkylark = isSkylark;
+ this.isStarlark = isStarlark;
this.targetKind = name + Rule.targetKindSuffix();
- this.skylarkTestable = skylarkTestable;
+ this.starlarkTestable = starlarkTestable;
this.documented = documented;
this.publicByDefault = publicByDefault;
this.binaryOutput = binaryOutput;
@@ -1688,7 +1688,7 @@
validateNoClashInPublicNames(attributes);
this.attributes = ImmutableList.copyOf(attributes);
this.workspaceOnly = workspaceOnly;
- this.isExecutableSkylark = isExecutableSkylark;
+ this.isExecutableStarlark = isExecutableStarlark;
this.isAnalysisTest = isAnalysisTest;
this.hasAnalysisTestTransition = hasAnalysisTestTransition;
this.hasFunctionTransitionWhitelist = hasFunctionTransitionWhitelist;
@@ -2557,20 +2557,18 @@
}
/** Returns true if this RuleClass is a Starlark-defined RuleClass. */
- public boolean isSkylark() {
- return isSkylark;
+ public boolean isStarlark() {
+ return isStarlark;
}
/** Returns true if this RuleClass is Starlark-defined and is subject to analysis-time tests. */
- public boolean isSkylarkTestable() {
- return skylarkTestable;
+ public boolean isStarlarkTestable() {
+ return starlarkTestable;
}
- /**
- * Returns true if this rule class outputs a default executable for every rule.
- */
- public boolean isExecutableSkylark() {
- return isExecutableSkylark;
+ /** Returns true if this rule class outputs a default executable for every rule. */
+ public boolean isExecutableStarlark() {
+ return isExecutableStarlark;
}
/** Returns true if this rule class is an analysis test (set by analysis_test = true). */
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
index 5b1c23e..c894642 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
@@ -39,7 +39,7 @@
builder.setPublicByDefault(rule.getRuleClassObject().isPublicByDefault());
RawAttributeMapper rawAttributeMapper = RawAttributeMapper.of(rule);
- boolean isSkylark = rule.getRuleClassObject().isSkylark();
+ boolean isSkylark = rule.getRuleClassObject().isStarlark();
if (isSkylark) {
builder.setSkylarkEnvironmentHashCode(
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java
index 2b46eca..2cc94de 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java
@@ -36,8 +36,8 @@
private final StarlarkCallable implementation;
private final ImmutableList<String> attributeAspects;
private final ImmutableList<Attribute> attributes;
- private final ImmutableList<ImmutableSet<SkylarkProviderIdentifier>> requiredAspectProviders;
- private final ImmutableSet<SkylarkProviderIdentifier> provides;
+ private final ImmutableList<ImmutableSet<StarlarkProviderIdentifier>> requiredAspectProviders;
+ private final ImmutableSet<StarlarkProviderIdentifier> provides;
private final ImmutableSet<String> paramAttributes;
private final ImmutableSet<String> fragments;
private final ConfigurationTransition hostTransition;
@@ -51,8 +51,8 @@
StarlarkCallable implementation,
ImmutableList<String> attributeAspects,
ImmutableList<Attribute> attributes,
- ImmutableList<ImmutableSet<SkylarkProviderIdentifier>> requiredAspectProviders,
- ImmutableSet<SkylarkProviderIdentifier> provides,
+ ImmutableList<ImmutableSet<StarlarkProviderIdentifier>> requiredAspectProviders,
+ ImmutableSet<StarlarkProviderIdentifier> provides,
ImmutableSet<String> paramAttributes,
ImmutableSet<String> fragments,
// The host transition is in lib.analysis, so we can't reference it directly here.
@@ -80,8 +80,8 @@
StarlarkCallable implementation,
ImmutableList<String> attributeAspects,
ImmutableList<Attribute> attributes,
- ImmutableList<ImmutableSet<SkylarkProviderIdentifier>> requiredAspectProviders,
- ImmutableSet<SkylarkProviderIdentifier> provides,
+ ImmutableList<ImmutableSet<StarlarkProviderIdentifier>> requiredAspectProviders,
+ ImmutableSet<StarlarkProviderIdentifier> provides,
ImmutableSet<String> paramAttributes,
ImmutableSet<String> fragments,
// The host transition is in lib.analysis, so we can't reference it directly here.
@@ -177,9 +177,9 @@
builder.add(attr);
}
builder.requireAspectsWithProviders(requiredAspectProviders);
- ImmutableList.Builder<SkylarkProviderIdentifier> advertisedSkylarkProviders =
+ ImmutableList.Builder<StarlarkProviderIdentifier> advertisedSkylarkProviders =
ImmutableList.builder();
- for (SkylarkProviderIdentifier provider : provides) {
+ for (StarlarkProviderIdentifier provider : provides) {
advertisedSkylarkProviders.add(provider);
}
builder.advertiseProvider(advertisedSkylarkProviders.build());
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProviderIdentifier.java
similarity index 77%
rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java
rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkProviderIdentifier.java
index 90012b8..36775c9 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProviderIdentifier.java
@@ -24,8 +24,8 @@
* A wrapper around Starlark provider identifier, representing either a declared provider ({@see
* SkylarkProvider}) or a "legacy" string identifier.
*/
-public final class SkylarkProviderIdentifier {
- private static final Interner<SkylarkProviderIdentifier> interner =
+public final class StarlarkProviderIdentifier {
+ private static final Interner<StarlarkProviderIdentifier> interner =
BlazeInterners.newWeakInterner();
@Nullable
@@ -33,27 +33,27 @@
@Nullable private final Provider.Key key;
/** Creates an id for a declared provider with a given key ({@see SkylarkProvider}). */
- public static SkylarkProviderIdentifier forKey(Provider.Key key) {
- return interner.intern(new SkylarkProviderIdentifier(key));
+ public static StarlarkProviderIdentifier forKey(Provider.Key key) {
+ return interner.intern(new StarlarkProviderIdentifier(key));
}
/** Creates an id for a provider with a given name. */
- public static SkylarkProviderIdentifier forLegacy(String legacyId) {
- return interner.intern(new SkylarkProviderIdentifier(legacyId));
+ public static StarlarkProviderIdentifier forLegacy(String legacyId) {
+ return interner.intern(new StarlarkProviderIdentifier(legacyId));
}
- private SkylarkProviderIdentifier(String legacyId) {
+ private StarlarkProviderIdentifier(String legacyId) {
this.legacyId = legacyId;
this.key = null;
}
- private SkylarkProviderIdentifier(Provider.Key key) {
+ private StarlarkProviderIdentifier(Provider.Key key) {
this.legacyId = null;
this.key = key;
}
/**
- * Returns true if this {@link SkylarkProviderIdentifier} identifies
+ * Returns true if this {@link StarlarkProviderIdentifier} identifies
* a legacy provider (with a string name).
*/
public boolean isLegacy() {
@@ -92,10 +92,10 @@
if (this == obj) {
return true;
}
- if (!(obj instanceof SkylarkProviderIdentifier)) {
+ if (!(obj instanceof StarlarkProviderIdentifier)) {
return false;
}
- SkylarkProviderIdentifier other = (SkylarkProviderIdentifier) obj;
+ StarlarkProviderIdentifier other = (StarlarkProviderIdentifier) obj;
return Objects.equals(legacyId, other.legacyId)
&& Objects.equals(key, other.key);
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
index 7bc58b0..ebb6e77 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -89,7 +89,7 @@
}
Rule rule = (Rule) target;
- return !rule.getRuleClassObject().isSkylark() && rule.getRuleClass().equals("alias");
+ return !rule.getRuleClassObject().isStarlark() && rule.getRuleClass().equals("alias");
}
/**
