The great Skylark -> Starlark class migration:
SkylarkApiProvider
SkylarkAttr -> StarlarkAttrModule
SkylarkAttributesCollection
SkylarkCommandLine
SkylarkCustomCommandLine
SkylarkErrorReporter
AndroidSkylarkApiProvider
CcSkylarkApiProvider
JavaSkylarkApiProvider
SkylarkAttrApi -> StarlarkAttrModuleApi
SkylarkAttributesCollectionApi
SkylarkCommandLineApi
FakeSkylarkAttrApi
FakeSkylarkCommandLineApi
CcSkylarkApiProviderTest
PiperOrigin-RevId: 308667674
diff --git a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
index ba60ab7..44209b4 100644
--- a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
+++ b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
@@ -39,10 +39,10 @@
import com.google.devtools.build.skydoc.fakebuildapi.FakeConfigApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeDefaultInfoProvider;
import com.google.devtools.build.skydoc.fakebuildapi.FakeOutputGroupInfo.FakeOutputGroupInfoProvider;
-import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkAttrApi;
-import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkCommandLineApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkNativeModuleApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkRuleFunctionsApi;
+import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkAttrModuleApi;
+import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkCommandLineApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi.FakeStructProviderApi;
import com.google.devtools.build.skydoc.fakebuildapi.android.FakeAndroidApplicationResourceInfo.FakeAndroidApplicationResourceInfoProvider;
import com.google.devtools.build.skydoc.fakebuildapi.android.FakeAndroidDeviceBrokerInfo.FakeAndroidDeviceBrokerInfoProvider;
@@ -168,8 +168,8 @@
TopLevelBootstrap topLevelBootstrap =
new TopLevelBootstrap(
new FakeBuildApiGlobals(),
- new FakeSkylarkAttrApi(),
- new FakeSkylarkCommandLineApi(),
+ new FakeStarlarkAttrModuleApi(),
+ new FakeStarlarkCommandLineApi(),
new FakeSkylarkNativeModuleApi(),
new FakeSkylarkRuleFunctionsApi(
Lists.newArrayList(), Lists.newArrayList(), Lists.newArrayList()),
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
index 4de5d46..aa46a17 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -123,12 +123,12 @@
":skylark/args",
":skylark/bazel_build_api_globals",
":skylark/function_transition_util",
- ":skylark/skylark_api_provider",
- ":skylark/skylark_command_line",
- ":skylark/skylark_custom_command_line",
- ":skylark/skylark_error_reporter",
":skylark/skylark_late_bound_default",
+ ":skylark/starlark_api_provider",
+ ":skylark/starlark_command_line",
":skylark/starlark_config",
+ ":skylark/starlark_custom_command_line",
+ ":skylark/starlark_error_reporter",
":statically_linked_marker_provider",
":target_configured_event",
":template_variable_info",
@@ -247,14 +247,14 @@
"extra/ExtraAction.java",
"extra/ExtraActionMapProvider.java",
"extra/ExtraActionSpec.java",
- "skylark/SkylarkAttr.java",
- "skylark/SkylarkAttributesCollection.java",
"skylark/SkylarkModules.java",
"skylark/SkylarkRuleClassFunctions.java",
"skylark/SkylarkRuleConfiguredTargetUtil.java",
"skylark/SkylarkRuleContext.java",
"skylark/StarlarkActionFactory.java",
+ "skylark/StarlarkAttrModule.java",
"skylark/StarlarkAttributeTransitionProvider.java",
+ "skylark/StarlarkAttributesCollection.java",
"skylark/StarlarkRuleTransitionProvider.java",
"skylark/StarlarkTransition.java",
"test/AnalysisTestActionBuilder.java",
@@ -342,9 +342,9 @@
":skylark/args",
":skylark/bazel_build_api_globals",
":skylark/function_transition_util",
- ":skylark/skylark_api_provider",
- ":skylark/skylark_command_line",
":skylark/skylark_late_bound_default",
+ ":skylark/starlark_api_provider",
+ ":skylark/starlark_command_line",
":template_variable_info",
":test/analysis_failure",
":test/analysis_failure_info",
@@ -1926,7 +1926,7 @@
name = "skylark/args",
srcs = ["skylark/Args.java"],
deps = [
- ":skylark/skylark_custom_command_line",
+ ":skylark/starlark_custom_command_line",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
"//src/main/java/com/google/devtools/build/lib/concurrent",
@@ -1969,8 +1969,8 @@
)
java_library(
- name = "skylark/skylark_api_provider",
- srcs = ["skylark/SkylarkApiProvider.java"],
+ name = "skylark/starlark_api_provider",
+ srcs = ["skylark/StarlarkApiProvider.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib:provider-collection",
"//third_party:guava",
@@ -1978,8 +1978,8 @@
)
java_library(
- name = "skylark/skylark_command_line",
- srcs = ["skylark/SkylarkCommandLine.java"],
+ name = "skylark/starlark_command_line",
+ srcs = ["skylark/StarlarkCommandLine.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/collect/nestedset",
@@ -1989,8 +1989,8 @@
)
java_library(
- name = "skylark/skylark_custom_command_line",
- srcs = ["skylark/SkylarkCustomCommandLine.java"],
+ name = "skylark/starlark_custom_command_line",
+ srcs = ["skylark/StarlarkCustomCommandLine.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:commandline_item",
@@ -2009,8 +2009,8 @@
)
java_library(
- name = "skylark/skylark_error_reporter",
- srcs = ["skylark/SkylarkErrorReporter.java"],
+ name = "skylark/starlark_error_reporter",
+ srcs = ["skylark/StarlarkErrorReporter.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index d2c9ccd..b48f7ca 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException;
import com.google.devtools.build.lib.analysis.config.CoreOptions;
import com.google.devtools.build.lib.analysis.config.CoreOptions.IncludeConfigFragmentsEnum;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkApiProvider;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -69,8 +69,8 @@
// Initialize every SkylarkApiProvider
for (int i = 0; i < providers.getProviderCount(); i++) {
Object obj = providers.getProviderInstanceAt(i);
- if (obj instanceof SkylarkApiProvider) {
- ((SkylarkApiProvider) obj).init(providers);
+ if (obj instanceof StarlarkApiProvider) {
+ ((StarlarkApiProvider) obj).init(providers);
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java b/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java
index 326d3f4..c06ba04 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java
@@ -25,8 +25,8 @@
* com.google.devtools.build.lib.packages.RuleErrorConsumer}.
*
* <p>Do not create new implementations of this class - instead, use {@link RuleContext} in Native
- * rule definitions, and {@link com.google.devtools.build.lib.analysis.skylark.SkylarkErrorReporter}
- * in Starlark API definitions. For use in testing, implement {@link RuleErrorConsumer} instead.
+ * rule definitions, and {@link StarlarkErrorReporter} in Starlark API definitions. For use in
+ * testing, implement {@link RuleErrorConsumer} instead.
*/
public abstract class EventHandlingErrorReporter implements RuleErrorConsumer {
private final String ruleClassNameForLogging;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
index 0ec6c8e..ea951d1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.analysis.Util;
import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
import com.google.devtools.build.lib.analysis.config.RunUnder;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkApiProvider;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
@@ -106,8 +106,8 @@
// Initialize every SkylarkApiProvider
for (int i = 0; i < providers.getProviderCount(); i++) {
Object obj = providers.getProviderInstanceAt(i);
- if (obj instanceof SkylarkApiProvider) {
- ((SkylarkApiProvider) obj).init(this);
+ if (obj instanceof StarlarkApiProvider) {
+ ((StarlarkApiProvider) obj).init(this);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java
index 60008a5..4745bb7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.actions.ParamFileInfo;
import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
import com.google.devtools.build.lib.actions.SingleStringArgFormatter;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkCustomCommandLine.ScalarArg;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkCustomCommandLine.ScalarArg;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.skylarkbuildapi.CommandLineArgsApi;
@@ -231,7 +231,7 @@
/** Args module. */
private static class MutableArgs extends Args implements StarlarkValue, Mutability.Freezable {
private final Mutability mutability;
- private final SkylarkCustomCommandLine.Builder commandLine;
+ private final StarlarkCustomCommandLine.Builder commandLine;
private final List<NestedSet<?>> potentialDirectoryArtifacts = new ArrayList<>();
private final Set<Artifact> directoryArtifacts = new HashSet<>();
private ParameterFileType parameterFileType = ParameterFileType.SHELL_QUOTED;
@@ -396,20 +396,20 @@
String terminateWith,
Location loc)
throws EvalException {
- SkylarkCustomCommandLine.VectorArg.Builder vectorArg;
+ StarlarkCustomCommandLine.VectorArg.Builder vectorArg;
if (value instanceof Depset) {
Depset skylarkNestedSet = (Depset) value;
NestedSet<?> nestedSet = skylarkNestedSet.getSet();
if (expandDirectories) {
potentialDirectoryArtifacts.add(nestedSet);
}
- vectorArg = new SkylarkCustomCommandLine.VectorArg.Builder(nestedSet);
+ vectorArg = new StarlarkCustomCommandLine.VectorArg.Builder(nestedSet);
} else {
Sequence<?> skylarkList = (Sequence) value;
if (expandDirectories) {
scanForDirectories(skylarkList);
}
- vectorArg = new SkylarkCustomCommandLine.VectorArg.Builder(skylarkList);
+ vectorArg = new StarlarkCustomCommandLine.VectorArg.Builder(skylarkList);
}
validateFormatString("format_each", formatEach);
validateFormatString("format_joined", formatJoined);
@@ -520,7 +520,7 @@
private MutableArgs(@Nullable Mutability mutability, StarlarkSemantics starlarkSemantics) {
this.mutability = mutability != null ? mutability : Mutability.IMMUTABLE;
- this.commandLine = new SkylarkCustomCommandLine.Builder(starlarkSemantics);
+ this.commandLine = new StarlarkCustomCommandLine.Builder(starlarkSemantics);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
index 6d3d29f..36ff63f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
@@ -33,8 +33,8 @@
private static TopLevelBootstrap topLevelBootstrap =
new TopLevelBootstrap(
new BazelBuildApiGlobals(),
- new SkylarkAttr(),
- new SkylarkCommandLine(),
+ new StarlarkAttrModule(),
+ new StarlarkCommandLine(),
new SkylarkNativeModule(),
new SkylarkRuleClassFunctions(),
StructProvider.STRUCT,
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 d2d2247..e30cc45 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
@@ -39,7 +39,7 @@
import com.google.devtools.build.lib.analysis.config.ConfigAwareRuleClassBuilder;
import com.google.devtools.build.lib.analysis.config.HostTransition;
import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkAttr.Descriptor;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkAttrModule.Descriptor;
import com.google.devtools.build.lib.analysis.test.TestConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
@@ -295,7 +295,7 @@
ImmutableList<StarlarkThread.CallStackEntry> callstack = thread.getCallStack();
builder.setCallStack(callstack.subList(0, callstack.size() - 1)); // pop 'rule' itself
- ImmutableList<Pair<String, SkylarkAttr.Descriptor>> attributes =
+ ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> attributes =
attrObjectToAttributesList(attrs);
if (skylarkTestable) {
@@ -380,7 +380,7 @@
}
for (Object o : providesArg) {
- if (!SkylarkAttr.isProvider(o)) {
+ if (!StarlarkAttrModule.isProvider(o)) {
throw Starlark.errorf(
"Illegal argument: element in 'provides' is of unexpected type. "
+ "Should be list of providers, but got item of type %s.",
@@ -388,7 +388,7 @@
}
}
for (StarlarkProviderIdentifier skylarkProvider :
- SkylarkAttr.getSkylarkProviderIdentifiers(providesArg)) {
+ StarlarkAttrModule.getStarlarkProviderIdentifiers(providesArg)) {
builder.advertiseStarlarkProvider(skylarkProvider);
}
@@ -405,9 +405,10 @@
}
}
- private static ImmutableList<Pair<String, Descriptor>> attrObjectToAttributesList(Object attrs)
- throws EvalException {
- ImmutableList.Builder<Pair<String, Descriptor>> attributes = ImmutableList.builder();
+ private static ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>>
+ attrObjectToAttributesList(Object attrs) throws EvalException {
+ ImmutableList.Builder<Pair<String, StarlarkAttrModule.Descriptor>> attributes =
+ ImmutableList.builder();
if (attrs != Starlark.NONE) {
for (Map.Entry<String, Descriptor> attr :
@@ -505,7 +506,7 @@
}
}
- ImmutableList<Pair<String, SkylarkAttr.Descriptor>> descriptors =
+ ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> descriptors =
attrObjectToAttributesList(attrs);
ImmutableList.Builder<Attribute> attributes = ImmutableList.builder();
ImmutableSet.Builder<String> requiredParams = ImmutableSet.builder();
@@ -548,7 +549,7 @@
}
for (Object o : providesArg) {
- if (!SkylarkAttr.isProvider(o)) {
+ if (!StarlarkAttrModule.isProvider(o)) {
throw new EvalException(
null,
String.format(
@@ -561,8 +562,9 @@
implementation,
attrAspects.build(),
attributes.build(),
- SkylarkAttr.buildProviderPredicate(requiredAspectProvidersArg, "required_aspect_providers"),
- SkylarkAttr.getSkylarkProviderIdentifiers(providesArg),
+ StarlarkAttrModule.buildProviderPredicate(
+ requiredAspectProvidersArg, "required_aspect_providers"),
+ StarlarkAttrModule.getStarlarkProviderIdentifiers(providesArg),
requiredParams.build(),
ImmutableSet.copyOf(Sequence.cast(fragments, String.class, "fragments")),
HostTransition.INSTANCE,
@@ -582,14 +584,14 @@
private RuleClass ruleClass;
private final RuleClassType type;
- private ImmutableList<Pair<String, SkylarkAttr.Descriptor>> attributes;
+ private ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> attributes;
private final Location definitionLocation;
private Label skylarkLabel;
public SkylarkRuleFunction(
RuleClass.Builder builder,
RuleClassType type,
- ImmutableList<Pair<String, SkylarkAttr.Descriptor>> attributes,
+ ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> attributes,
Location definitionLocation) {
this.builder = builder;
this.type = type;
@@ -681,9 +683,9 @@
// check if we have an attribute transition.
boolean hasStarlarkDefinedTransition = builder.hasStarlarkRuleTransition();
boolean hasFunctionTransitionWhitelist = false;
- for (Pair<String, SkylarkAttr.Descriptor> attribute : attributes) {
+ for (Pair<String, StarlarkAttrModule.Descriptor> attribute : attributes) {
String name = attribute.getFirst();
- SkylarkAttr.Descriptor descriptor = attribute.getSecond();
+ StarlarkAttrModule.Descriptor descriptor = attribute.getSecond();
Attribute attr = descriptor.build(name);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
index 1556e07..03a8d49 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
@@ -140,8 +140,8 @@
private final StarlarkSemantics starlarkSemantics;
private Dict<String, String> makeVariables;
- private SkylarkAttributesCollection attributesCollection;
- private SkylarkAttributesCollection ruleAttributesCollection;
+ private StarlarkAttributesCollection attributesCollection;
+ private StarlarkAttributesCollection ruleAttributesCollection;
private StructImpl splitAttributes;
// TODO(bazel-team): we only need this because of the css_binary rule.
@@ -222,7 +222,7 @@
this.artifactsLabelMap = artifactLabelMapBuilder.build();
this.outputsObject = outputs;
- SkylarkAttributesCollection.Builder builder = SkylarkAttributesCollection.builder(this);
+ StarlarkAttributesCollection.Builder builder = StarlarkAttributesCollection.builder(this);
for (Attribute attribute : ruleContext.getRule().getAttributes()) {
Object value = ruleContext.attributes().get(attribute.getName(), attribute.getType());
builder.addAttribute(attribute, value);
@@ -238,14 +238,15 @@
ImmutableCollection<Attribute> attributes =
ruleContext.getMainAspect().getDefinition().getAttributes().values();
- SkylarkAttributesCollection.Builder aspectBuilder = SkylarkAttributesCollection.builder(this);
+ StarlarkAttributesCollection.Builder aspectBuilder =
+ StarlarkAttributesCollection.builder(this);
for (Attribute attribute : attributes) {
aspectBuilder.addAttribute(attribute, attribute.getDefaultValue(null));
}
this.attributesCollection = aspectBuilder.build();
this.splitAttributes = null;
- SkylarkAttributesCollection.Builder ruleBuilder = SkylarkAttributesCollection.builder(this);
+ StarlarkAttributesCollection.Builder ruleBuilder = StarlarkAttributesCollection.builder(this);
for (Attribute attribute : ruleContext.getRule().getAttributes()) {
Object value = ruleContext.attributes().get(attribute.getName(), attribute.getType());
@@ -657,7 +658,7 @@
}
@Override
- public SkylarkAttributesCollection rule() throws EvalException {
+ public StarlarkAttributesCollection rule() throws EvalException {
checkMutable("rule");
if (!isForAspect) {
throw new EvalException(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkApiProvider.java
similarity index 97%
rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java
rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkApiProvider.java
index 6573000..42800aa 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkApiProvider.java
@@ -21,7 +21,7 @@
* An abstract class for adding a Starlark API for the native providers. Derived classes should
* declare functions to be used from Starlark.
*/
-public abstract class SkylarkApiProvider {
+public abstract class StarlarkApiProvider {
private ProviderCollection info;
protected ProviderCollection getInfo() {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java
similarity index 97%
rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java
rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java
index bfb7f3f..31cb6c7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java
@@ -41,7 +41,7 @@
import com.google.devtools.build.lib.packages.Type.ConversionException;
import com.google.devtools.build.lib.packages.Type.LabelClass;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAttrApi;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAttrModuleApi;
import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
@@ -64,7 +64,7 @@
* The functions are executed through reflection. As everywhere in Starlark, arguments are
* type-checked with the signature and cannot be null.
*/
-public final class SkylarkAttr implements SkylarkAttrApi {
+public final class StarlarkAttrModule implements StarlarkAttrModuleApi {
// Arguments
@@ -315,7 +315,7 @@
}
}
if (isListOfProviders) {
- return ImmutableList.of(getSkylarkProviderIdentifiers(obj));
+ return ImmutableList.of(getStarlarkProviderIdentifiers(obj));
} else {
return getProvidersList(obj, argumentName);
}
@@ -333,7 +333,7 @@
* Converts Starlark identifiers of providers (either a string or a provider value) to their
* internal representations.
*/
- static ImmutableSet<StarlarkProviderIdentifier> getSkylarkProviderIdentifiers(Sequence<?> list)
+ static ImmutableSet<StarlarkProviderIdentifier> getStarlarkProviderIdentifiers(Sequence<?> list)
throws EvalException {
ImmutableList.Builder<StarlarkProviderIdentifier> result = ImmutableList.builder();
@@ -353,14 +353,14 @@
}
private static ImmutableList<ImmutableSet<StarlarkProviderIdentifier>> getProvidersList(
- Sequence<?> skylarkList, String argumentName) throws EvalException {
+ Sequence<?> starlarkList, String argumentName) throws EvalException {
ImmutableList.Builder<ImmutableSet<StarlarkProviderIdentifier>> providersList =
ImmutableList.builder();
String errorMsg = "Illegal argument: element in '%s' is of unexpected type. "
+ "Either all elements should be providers, "
+ "or all elements should be lists of providers, but got %s.";
- for (Object o : skylarkList) {
+ for (Object o : starlarkList) {
if (!(o instanceof Sequence)) {
throw new EvalException(
null,
@@ -380,7 +380,7 @@
+ EvalUtils.getDataTypeNameFromClass(value.getClass())));
}
}
- providersList.add(getSkylarkProviderIdentifiers((Sequence<?>) o));
+ providersList.add(getStarlarkProviderIdentifiers((Sequence<?>) o));
}
return providersList.build();
}
@@ -777,7 +777,7 @@
/** A descriptor of an attribute defined in Starlark. */
@AutoCodec
- public static final class Descriptor implements SkylarkAttrApi.Descriptor {
+ public static final class Descriptor implements StarlarkAttrModuleApi.Descriptor {
private final ImmutableAttributeFactory attributeFactory;
private final String name;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java
index f4254bd..19e877f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.analysis.skylark;
import static com.google.devtools.build.lib.analysis.skylark.FunctionTransitionUtil.applyAndValidate;
-import static com.google.devtools.build.lib.analysis.skylark.SkylarkAttributesCollection.ERROR_MESSAGE_FOR_NO_ATTR;
+import static com.google.devtools.build.lib.analysis.skylark.StarlarkAttributesCollection.ERROR_MESSAGE_FOR_NO_ATTR;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
@@ -48,7 +48,7 @@
* <p>For starlark defined rule class transitions, see {@link StarlarkRuleTransitionProvider}.
*
* <p>TODO(bazel-team): Consider allowing dependency-typed attributes to actually return providers
- * instead of just labels (see {@link SkylarkAttributesCollection#addAttribute}).
+ * instead of just labels (see {@link StarlarkAttributesCollection#addAttribute}).
*/
public class StarlarkAttributeTransitionProvider
implements TransitionFactory<AttributeTransitionData>, SplitTransitionProviderApi {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java
similarity index 94%
rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java
rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java
index 59f22e8..6040420 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.packages.StructProvider;
import com.google.devtools.build.lib.packages.Type;
import com.google.devtools.build.lib.packages.Type.LabelClass;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAttributesCollectionApi;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAttributesCollectionApi;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Printer;
import com.google.devtools.build.lib.syntax.Starlark;
@@ -37,8 +37,8 @@
import java.util.Map;
/** Information about attributes of a rule an aspect is applied to. */
-class SkylarkAttributesCollection implements SkylarkAttributesCollectionApi {
- private final SkylarkRuleContext skylarkRuleContext;
+class StarlarkAttributesCollection implements StarlarkAttributesCollectionApi {
+ private final SkylarkRuleContext starlarkRuleContext;
private final StructImpl attrObject;
private final StructImpl executableObject;
private final StructImpl fileObject;
@@ -49,15 +49,15 @@
static final String ERROR_MESSAGE_FOR_NO_ATTR =
"No attribute '%s' in attr. Make sure you declared a rule attribute with this name.";
- private SkylarkAttributesCollection(
- SkylarkRuleContext skylarkRuleContext,
+ private StarlarkAttributesCollection(
+ SkylarkRuleContext starlarkRuleContext,
String ruleClassName,
Map<String, Object> attrs,
Map<String, Object> executables,
Map<String, Object> singleFiles,
Map<String, Object> files,
ImmutableMap<Artifact, FilesToRunProvider> executableRunfilesMap) {
- this.skylarkRuleContext = skylarkRuleContext;
+ this.starlarkRuleContext = starlarkRuleContext;
this.ruleClassName = ruleClassName;
attrObject = StructProvider.STRUCT.create(attrs, ERROR_MESSAGE_FOR_NO_ATTR);
executableObject =
@@ -79,7 +79,7 @@
}
private void checkMutable(String attrName) throws EvalException {
- skylarkRuleContext.checkMutable("rule." + attrName);
+ starlarkRuleContext.checkMutable("rule." + attrName);
}
@Override
@@ -118,12 +118,12 @@
@Override
public boolean isImmutable() {
- return skylarkRuleContext.isImmutable();
+ return starlarkRuleContext.isImmutable();
}
@Override
public void repr(Printer printer) {
- printer.append("<rule collection for " + skylarkRuleContext.getRuleLabelCanonicalName() + ">");
+ printer.append("<rule collection for " + starlarkRuleContext.getRuleLabelCanonicalName() + ">");
}
public static Builder builder(SkylarkRuleContext ruleContext) {
@@ -254,8 +254,8 @@
}
}
- public SkylarkAttributesCollection build() {
- return new SkylarkAttributesCollection(
+ public StarlarkAttributesCollection build() {
+ return new StarlarkAttributesCollection(
context,
context.getRuleContext().getRule().getRuleClass(),
attrBuilder,
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java
similarity index 90%
rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java
rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java
index 984f45f..8503179 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java
@@ -16,12 +16,12 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkCommandLineApi;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkCommandLineApi;
import com.google.devtools.build.lib.syntax.Depset;
import com.google.devtools.build.lib.syntax.EvalException;
/** A Starlark module class to create memory efficient command lines. */
-public class SkylarkCommandLine implements SkylarkCommandLineApi {
+public class StarlarkCommandLine implements StarlarkCommandLineApi {
@Override
public String joinPaths(String separator, Depset files) throws EvalException {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCustomCommandLine.java
similarity index 99%
rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCustomCommandLine.java
index 9f9ac8a..96d8d75 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCustomCommandLine.java
@@ -56,7 +56,7 @@
/** Supports ctx.actions.args() from Starlark. */
@AutoCodec
-public class SkylarkCustomCommandLine extends CommandLine {
+public class StarlarkCustomCommandLine extends CommandLine {
private final StarlarkSemantics starlarkSemantics;
private final ImmutableList<Object> arguments;
@@ -733,14 +733,14 @@
return this;
}
- SkylarkCustomCommandLine build() {
- return new SkylarkCustomCommandLine(starlarkSemantics, arguments.build());
+ StarlarkCustomCommandLine build() {
+ return new StarlarkCustomCommandLine(starlarkSemantics, arguments.build());
}
}
@AutoCodec.VisibleForSerialization
@AutoCodec.Instantiator
- SkylarkCustomCommandLine(StarlarkSemantics starlarkSemantics, ImmutableList<Object> arguments) {
+ StarlarkCustomCommandLine(StarlarkSemantics starlarkSemantics, ImmutableList<Object> arguments) {
this.arguments = arguments;
this.starlarkSemantics = starlarkSemantics;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkErrorReporter.java
similarity index 89%
rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java
rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkErrorReporter.java
index 6f66680..b3ab3a7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkErrorReporter.java
@@ -27,14 +27,14 @@
* before leaving native code. The {@link #close()} method will only throw {@link EvalException},
* properly wrapping any {@link RuleErrorException} instances if needed.
*/
-public class SkylarkErrorReporter implements AutoCloseable, RuleErrorConsumer {
+public class StarlarkErrorReporter implements AutoCloseable, RuleErrorConsumer {
private final RuleErrorConsumer ruleErrorConsumer;
- public static SkylarkErrorReporter from(RuleErrorConsumer ruleErrorConsumer) {
- return new SkylarkErrorReporter(ruleErrorConsumer);
+ public static StarlarkErrorReporter from(RuleErrorConsumer ruleErrorConsumer) {
+ return new StarlarkErrorReporter(ruleErrorConsumer);
}
- private SkylarkErrorReporter(RuleErrorConsumer ruleErrorConsumer) {
+ private StarlarkErrorReporter(RuleErrorConsumer ruleErrorConsumer) {
this.ruleErrorConsumer = ruleErrorConsumer;
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
index ae2a5ed..e6dd9ca 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
@@ -21,7 +21,7 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.analysis.BaseRuleClasses;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkAttr.Descriptor;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkAttrModule.Descriptor;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.packages.AttributeValueSource;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
index 53506ff..cb058fa 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImport.java
@@ -42,9 +42,9 @@
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceInfoProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaToolchainProvider;
import com.google.devtools.build.lib.vfs.PathFragment;
import javax.annotation.Nullable;
@@ -235,7 +235,7 @@
ruleBuilder
.setFilesToBuild(filesToBuild)
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addProvider(RunfilesProvider.class, RunfilesProvider.EMPTY)
.addNativeDeclaredProvider(
new AndroidNativeLibsInfo(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index b1164b8..61bb659 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -67,8 +67,8 @@
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaTargetAttributes;
import com.google.devtools.build.lib.rules.java.JavaUtil;
import com.google.devtools.build.lib.rules.java.proto.GeneratedExtensionRegistryProvider;
@@ -725,7 +725,7 @@
// Binary rule; allow extracting merged manifest from Starlark via
// ctx.attr.android_binary.android.merged_manifest, but not much more.
builder.addSkylarkTransitiveInfo(
- AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider(/*resourceInfo=*/ null));
+ AndroidStarlarkApiProvider.NAME, new AndroidStarlarkApiProvider(/*resourceInfo=*/ null));
} else {
resourceApk.addToConfiguredTargetBuilder(
builder, ruleContext.getLabel(), /* includeSkylarkApiProvider = */ true, isLibrary);
@@ -734,7 +734,7 @@
return builder
.setFilesToBuild(filesToBuild)
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addNativeDeclaredProvider(javaInfo)
.addProvider(RunfilesProvider.class, RunfilesProvider.simple(getRunfiles()))
.addNativeDeclaredProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
index 83d4287..cb99024 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
@@ -58,9 +58,9 @@
import com.google.devtools.build.lib.rules.java.JavaRuntimeClasspathProvider;
import com.google.devtools.build.lib.rules.java.JavaRuntimeInfo;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceInfoProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaTargetAttributes;
import com.google.devtools.build.lib.rules.java.JavaToolchainProvider;
import com.google.devtools.build.lib.rules.java.OneVersionCheckActionBuilder;
@@ -363,7 +363,7 @@
return builder
.setFilesToBuild(filesToBuild)
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addNativeDeclaredProvider(javaInfo)
.addProvider(
RunfilesProvider.class,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
similarity index 95%
rename from src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java
rename to src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
index 20b6635..141236a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
@@ -18,7 +18,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkApiProvider;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -35,7 +35,7 @@
* stable interface for Starlark users.
*/
@Immutable
-public class AndroidSkylarkApiProvider extends SkylarkApiProvider
+public class AndroidStarlarkApiProvider extends StarlarkApiProvider
implements AndroidSkylarkApiProviderApi<Artifact> {
/** The name of the field in Starlark used to access this class. */
public static final String NAME = "android";
@@ -43,7 +43,7 @@
private final IdlInfo idlInfo = new IdlInfo();
private final AndroidResourcesInfo resourceInfo;
- public AndroidSkylarkApiProvider(AndroidResourcesInfo resourceInfo) {
+ public AndroidStarlarkApiProvider(AndroidResourcesInfo resourceInfo) {
this.resourceInfo = resourceInfo;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java
index 00cc31e..3299b1a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.FileProvider;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkErrorReporter;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkErrorReporter;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -92,8 +92,8 @@
boolean neverlink,
String customPackage)
throws InterruptedException, EvalException {
- try (SkylarkErrorReporter errorReporter =
- SkylarkErrorReporter.from(ctx.getRuleErrorConsumer())) {
+ try (StarlarkErrorReporter errorReporter =
+ StarlarkErrorReporter.from(ctx.getRuleErrorConsumer())) {
return ResourceApk.processFromTransitiveLibraryData(
ctx,
DataBinding.getDisabledDataBindingContext(ctx),
@@ -114,8 +114,8 @@
AndroidDataContext ctx, Object manifest, Object customPackage, boolean exported)
throws InterruptedException, EvalException {
String pkg = fromNoneable(customPackage, String.class);
- try (SkylarkErrorReporter errorReporter =
- SkylarkErrorReporter.from(ctx.getRuleErrorConsumer())) {
+ try (StarlarkErrorReporter errorReporter =
+ StarlarkErrorReporter.from(ctx.getRuleErrorConsumer())) {
return AndroidManifest.from(
ctx,
errorReporter,
@@ -136,7 +136,7 @@
Sequence<?> deps, // <AndroidAssetsInfo>
boolean neverlink)
throws EvalException, InterruptedException {
- SkylarkErrorReporter errorReporter = SkylarkErrorReporter.from(ctx.getRuleErrorConsumer());
+ StarlarkErrorReporter errorReporter = StarlarkErrorReporter.from(ctx.getRuleErrorConsumer());
try {
return AndroidAssets.from(
errorReporter,
@@ -161,7 +161,7 @@
boolean neverlink,
boolean enableDataBinding)
throws EvalException, InterruptedException {
- SkylarkErrorReporter errorReporter = SkylarkErrorReporter.from(ctx.getRuleErrorConsumer());
+ StarlarkErrorReporter errorReporter = StarlarkErrorReporter.from(ctx.getRuleErrorConsumer());
try {
return AndroidResources.from(
errorReporter,
@@ -303,7 +303,7 @@
Sequence<?> resourceConfigurationFilters, // <String>
Sequence<?> densities) // <String>)
throws InterruptedException, EvalException {
- SkylarkErrorReporter errorReporter = SkylarkErrorReporter.from(ctx.getRuleErrorConsumer());
+ StarlarkErrorReporter errorReporter = StarlarkErrorReporter.from(ctx.getRuleErrorConsumer());
List<ConfiguredTarget> depsTargets = Sequence.cast(deps, ConfiguredTarget.class, "deps");
try {
@@ -362,7 +362,7 @@
}
private static IllegalStateException handleRuleException(
- SkylarkErrorReporter errorReporter, RuleErrorException exception) throws EvalException {
+ StarlarkErrorReporter errorReporter, RuleErrorException exception) throws EvalException {
// The error reporter should have been notified of the rule error, and thus closing it will
// throw an EvalException.
errorReporter.close();
@@ -434,7 +434,7 @@
boolean crunchPng,
boolean dataBindingEnabled)
throws InterruptedException, EvalException {
- SkylarkErrorReporter errorReporter = SkylarkErrorReporter.from(ctx.getRuleErrorConsumer());
+ StarlarkErrorReporter errorReporter = StarlarkErrorReporter.from(ctx.getRuleErrorConsumer());
List<ConfiguredTarget> depsTargets = Sequence.cast(deps, ConfiguredTarget.class, "deps");
Map<String, String> manifestValueMap =
Dict.cast(manifestValues, String.class, String.class, "manifest_values");
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java
index 0cf6f31..36c946d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java
@@ -296,7 +296,7 @@
if (includeSkylarkApiProvider) {
builder.addSkylarkTransitiveInfo(
- AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider(resourceInfo));
+ AndroidStarlarkApiProvider.NAME, new AndroidStarlarkApiProvider(resourceInfo));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index 213f075..f8f7373 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -707,7 +707,7 @@
ruleBuilder.addOutputGroup("runtime_dynamic_libraries", copiedRuntimeDynamicLibraries);
}
- CcSkylarkApiProvider.maybeAdd(ruleContext, ruleBuilder);
+ CcStarlarkApiProvider.maybeAdd(ruleContext, ruleBuilder);
ruleBuilder
.addProvider(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
.addProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
index 0ea7fbd..0cce7cc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcImport.java
@@ -186,7 +186,7 @@
.addOutputGroups(outputGroups)
.addProvider(RunfilesProvider.class, RunfilesProvider.simple(Runfiles.EMPTY));
- CcSkylarkApiProvider.maybeAdd(ruleContext, result);
+ CcStarlarkApiProvider.maybeAdd(ruleContext, result);
return result.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index c6c6ab1..dcc515c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -452,7 +452,7 @@
ccToolchain,
featureConfiguration,
ruleContext);
- CcSkylarkApiProvider.maybeAdd(ruleContext, targetBuilder);
+ CcStarlarkApiProvider.maybeAdd(ruleContext, targetBuilder);
targetBuilder
.setFilesToBuild(filesToBuild)
.addProvider(ccNativeLibraryProvider)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java
similarity index 96%
rename from src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
rename to src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java
index 3ffc0a3..fa70e24 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java
@@ -18,7 +18,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder;
import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkApiProvider;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
@@ -31,14 +31,14 @@
* interface for Starlark users.
*/
@AutoCodec
-public final class CcSkylarkApiProvider extends SkylarkApiProvider
+public final class CcStarlarkApiProvider extends StarlarkApiProvider
implements CcSkylarkApiProviderApi<Artifact> {
/** The name of the field in Starlark used to access this class. */
public static final String NAME = "cc";
public static void maybeAdd(RuleContext ruleContext, RuleConfiguredTargetBuilder builder) {
if (ruleContext.getFragment(CppConfiguration.class).enableLegacyCcProvider()) {
- builder.addSkylarkTransitiveInfo(NAME, new CcSkylarkApiProvider());
+ builder.addSkylarkTransitiveInfo(NAME, new CcStarlarkApiProvider());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java
index eff122b..ab5da11 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibrary.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.analysis.Runfiles;
import com.google.devtools.build.lib.analysis.RunfilesProvider;
import com.google.devtools.build.lib.rules.cpp.CcCommon;
-import com.google.devtools.build.lib.rules.cpp.CcSkylarkApiProvider;
+import com.google.devtools.build.lib.rules.cpp.CcStarlarkApiProvider;
/** Part of the implementation of cc_proto_library. */
public class CcProtoLibrary implements RuleConfiguredTargetFactory {
@@ -59,7 +59,7 @@
depProviders.outputGroupInfo.getOutputGroup(groupName));
}
- CcSkylarkApiProvider.maybeAdd(ruleContext, ruleConfiguredTargetBuilder);
+ CcStarlarkApiProvider.maybeAdd(ruleContext, ruleConfiguredTargetBuilder);
return ruleConfiguredTargetBuilder.build();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
index fa3929d..431d2a7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
@@ -126,9 +126,9 @@
"JavaRunfilesProvider.java",
"JavaRuntimeInfo.java",
"JavaSemantics.java",
- "JavaSkylarkApiProvider.java",
"JavaSourceInfoProvider.java",
"JavaSourceJarsProvider.java",
+ "JavaStarlarkApiProvider.java",
"JavaStarlarkCommon.java",
"JavaStrictCompilationArgsProvider.java",
"JavaTargetAttributes.java",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 775d4e4..dee7a1d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -483,7 +483,7 @@
.setFilesToBuild(filesToBuild)
.addNativeDeclaredProvider(javaInfo)
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.add(RunfilesProvider.class, runfilesProvider)
// The executable to run (below) may be different from the executable for runfiles (the one
// we create the runfiles support object with). On Linux they are the same (it's the same
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
index 1401419..465ca38 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java
@@ -154,7 +154,7 @@
return ruleBuilder
.setFilesToBuild(filesToBuild)
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addNativeDeclaredProvider(javaInfo)
.add(RunfilesProvider.class, RunfilesProvider.simple(runfiles))
.add(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
index 41adc32..e9a2bd5d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
@@ -196,7 +196,7 @@
builder
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addProvider(
RunfilesProvider.simple(
JavaCommon.getRunfiles(ruleContext, semantics, javaArtifacts, neverLink)))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java
similarity index 85%
rename from src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
rename to src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java
index 47995a6..80a2fa7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.rules.java;
import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkApiProvider;
+import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider;
import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
import com.google.devtools.build.lib.skylarkbuildapi.java.JavaSkylarkApiProviderApi;
@@ -23,7 +23,7 @@
* A class that exposes the Java providers to Starlark. It is intended to provide a simple and
* stable interface for Starlark users.
*/
-public final class JavaSkylarkApiProvider extends SkylarkApiProvider
+public final class JavaStarlarkApiProvider extends StarlarkApiProvider
implements JavaSkylarkApiProviderApi<Artifact> {
/** The name of the field in Starlark used to access this class. */
public static final String NAME = "java";
@@ -34,7 +34,7 @@
/**
* Creates a Starlark API provider that reads information from its associated target's providers.
*/
- public static JavaSkylarkApiProvider fromRuleContext() {
- return new JavaSkylarkApiProvider();
+ public static JavaStarlarkApiProvider fromRuleContext() {
+ return new JavaStarlarkApiProvider();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
index f124669..012e213 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
@@ -46,8 +46,8 @@
import com.google.devtools.build.lib.rules.java.JavaRuleClasses;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder;
import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder.Exports;
import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder.Services;
@@ -113,7 +113,7 @@
.advertiseProvider(JavaProtoLibraryAspectProvider.class)
.advertiseProvider(
ImmutableList.of(StarlarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())))
- .advertiseProvider(ImmutableList.of(JavaSkylarkApiProvider.SKYLARK_NAME))
+ .advertiseProvider(ImmutableList.of(JavaStarlarkApiProvider.SKYLARK_NAME))
.add(
attr(JavaProtoAspectCommon.LITE_PROTO_TOOLCHAIN_ATTR, LABEL)
.mandatoryNativeProviders(
@@ -230,9 +230,9 @@
aspect.addNativeDeclaredProvider(
createCcLinkingInfo(ruleContext, aspectCommon.getProtoRuntimeDeps()));
- JavaSkylarkApiProvider skylarkApiProvider = JavaSkylarkApiProvider.fromRuleContext();
+ JavaStarlarkApiProvider skylarkApiProvider = JavaStarlarkApiProvider.fromRuleContext();
aspect
- .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, skylarkApiProvider)
+ .addSkylarkTransitiveInfo(JavaStarlarkApiProvider.NAME, skylarkApiProvider)
.addNativeDeclaredProvider(javaInfo.build())
.addProvider(
new JavaProtoLibraryAspectProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
index 7737f08..bd941ba 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
@@ -39,8 +39,8 @@
import com.google.devtools.build.lib.rules.java.JavaInfo;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRunfilesProvider;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaStrictCompilationArgsProvider;
import com.google.devtools.build.lib.rules.java.ProguardLibrary;
import com.google.devtools.build.lib.rules.java.ProguardSpecProvider;
@@ -105,7 +105,7 @@
return new RuleConfiguredTargetBuilder(ruleContext)
.setFilesToBuild(filesToBuild.build())
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addProvider(RunfilesProvider.withData(Runfiles.EMPTY, runfiles))
.addOutputGroup(OutputGroupInfo.DEFAULT, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER))
.addNativeDeclaredProvider(getJavaLiteRuntimeSpec(ruleContext))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
index 33167de..972aa2c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
@@ -46,8 +46,8 @@
import com.google.devtools.build.lib.rules.java.JavaRuleClasses;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaSemantics;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder;
import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder.Exports;
import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder.Services;
@@ -122,7 +122,7 @@
.advertiseProvider(JavaProtoLibraryAspectProvider.class)
.advertiseProvider(
ImmutableList.of(StarlarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())))
- .advertiseProvider(ImmutableList.of(JavaSkylarkApiProvider.SKYLARK_NAME))
+ .advertiseProvider(ImmutableList.of(JavaStarlarkApiProvider.SKYLARK_NAME))
.add(
attr(JavaProtoAspectCommon.SPEED_PROTO_TOOLCHAIN_ATTR, LABEL)
// TODO(carmi): reinstate mandatoryNativeProviders(ProtoLangToolchainProvider)
@@ -247,9 +247,9 @@
javaInfo.addProvider(JavaCompilationArgsProvider.class, generatedCompilationArgsProvider);
aspect.addNativeDeclaredProvider(
createCcLinkingInfo(ruleContext, aspectCommon.getProtoRuntimeDeps()));
- JavaSkylarkApiProvider javaSkylarkApiProvider = JavaSkylarkApiProvider.fromRuleContext();
+ JavaStarlarkApiProvider javaSkylarkApiProvider = JavaStarlarkApiProvider.fromRuleContext();
aspect
- .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.NAME, javaSkylarkApiProvider)
+ .addSkylarkTransitiveInfo(JavaStarlarkApiProvider.NAME, javaSkylarkApiProvider)
.addNativeDeclaredProvider(javaInfo.build())
.addProvider(
new JavaProtoLibraryAspectProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
index 17b8ab5..69a4332 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoLibrary.java
@@ -36,8 +36,8 @@
import com.google.devtools.build.lib.rules.java.JavaInfo;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRunfilesProvider;
-import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStarlarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaStrictCompilationArgsProvider;
/** Implementation of the java_proto_library rule. */
@@ -100,7 +100,7 @@
new RuleConfiguredTargetBuilder(ruleContext)
.setFilesToBuild(filesToBuild.build())
.addSkylarkTransitiveInfo(
- JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext())
+ JavaStarlarkApiProvider.NAME, JavaStarlarkApiProvider.fromRuleContext())
.addProvider(RunfilesProvider.withData(Runfiles.EMPTY, runfiles))
.addOutputGroup(
OutputGroupInfo.DEFAULT, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER))
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java
index a9a6462..8a6dbf6 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java
@@ -295,7 +295,7 @@
doc =
"Returns rule attributes descriptor for the rule that aspect is applied to."
+ " Only available in aspect implementation functions.")
- SkylarkAttributesCollectionApi rule() throws EvalException;
+ StarlarkAttributesCollectionApi rule() throws EvalException;
@SkylarkCallable(
name = "aspect_ids",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAttrApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
similarity index 99%
rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAttrApi.java
rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
index badbe68..b6e7f06 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAttrApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
@@ -48,7 +48,7 @@
+ "<p>See the Rules page for more on "
+ "<a href='../rules.$DOC_EXT#attributes'>defining</a> and "
+ "<a href='../rules.$DOC_EXT#implementation-function'>using</a> attributes.")
-public interface SkylarkAttrApi extends StarlarkValue {
+public interface StarlarkAttrModuleApi extends StarlarkValue {
// dependency and output attributes
String LABEL_PARAGRAPH =
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAttributesCollectionApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java
similarity index 96%
rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAttributesCollectionApi.java
rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java
index 5a86645..4f82567 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAttributesCollectionApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java
@@ -26,7 +26,7 @@
name = "rule_attributes",
category = SkylarkModuleCategory.BUILTIN,
doc = "Information about attributes of a rule an aspect is applied to.")
-public interface SkylarkAttributesCollectionApi extends StarlarkValue {
+public interface StarlarkAttributesCollectionApi extends StarlarkValue {
@SkylarkCallable(name = "attr", structField = true, doc = SkylarkRuleContextApi.ATTR_DOC)
StructApi getAttr() throws EvalException;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkCommandLineApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java
similarity index 96%
rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkCommandLineApi.java
rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java
index 8be8556..5454047 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkCommandLineApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java
@@ -30,7 +30,7 @@
category = SkylarkModuleCategory.TOP_LEVEL_TYPE,
doc = "Deprecated. Module for creating memory efficient command lines.")
@StarlarkDeprecated
-public interface SkylarkCommandLineApi extends StarlarkValue {
+public interface StarlarkCommandLineApi extends StarlarkValue {
@SkylarkCallable(
name = "join_paths",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java
index 7ee94aa..ddcfbef 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java
@@ -26,8 +26,8 @@
*/
public class TopLevelBootstrap implements Bootstrap {
private final SkylarkBuildApiGlobals skylarkBuildApiGlobals;
- private final SkylarkAttrApi skylarkAttrApi;
- private final SkylarkCommandLineApi skylarkCommandLineApi;
+ private final StarlarkAttrModuleApi starlarkAttrModuleApi;
+ private final StarlarkCommandLineApi starlarkCommandLineApi;
private final SkylarkNativeModuleApi skylarkNativeModuleApi;
private final SkylarkRuleFunctionsApi<?> skylarkRuleFunctionsApi;
private final StructApi.StructProviderApi structProvider;
@@ -37,17 +37,17 @@
public TopLevelBootstrap(
SkylarkBuildApiGlobals skylarkBuildApiGlobals,
- SkylarkAttrApi skylarkAttrApi,
- SkylarkCommandLineApi skylarkCommandLineApi,
+ StarlarkAttrModuleApi starlarkAttrModuleApi,
+ StarlarkCommandLineApi starlarkCommandLineApi,
SkylarkNativeModuleApi skylarkNativeModuleApi,
SkylarkRuleFunctionsApi<?> skylarkRuleFunctionsApi,
StructApi.StructProviderApi structProvider,
OutputGroupInfoApiProvider outputGroupInfoProvider,
ActionsInfoProviderApi actionsInfoProviderApi,
DefaultInfoApiProvider<?, ?> defaultInfoProvider) {
- this.skylarkAttrApi = skylarkAttrApi;
+ this.starlarkAttrModuleApi = starlarkAttrModuleApi;
this.skylarkBuildApiGlobals = skylarkBuildApiGlobals;
- this.skylarkCommandLineApi = skylarkCommandLineApi;
+ this.starlarkCommandLineApi = starlarkCommandLineApi;
this.skylarkNativeModuleApi = skylarkNativeModuleApi;
this.skylarkRuleFunctionsApi = skylarkRuleFunctionsApi;
this.structProvider = structProvider;
@@ -60,8 +60,8 @@
public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
Starlark.addMethods(builder, skylarkBuildApiGlobals);
Starlark.addMethods(builder, skylarkRuleFunctionsApi);
- Starlark.addModule(builder, skylarkAttrApi); // "attr"
- Starlark.addModule(builder, skylarkCommandLineApi); // "cmd_helper"
+ Starlark.addModule(builder, starlarkAttrModuleApi); // "attr"
+ Starlark.addModule(builder, starlarkCommandLineApi); // "cmd_helper"
Starlark.addModule(builder, skylarkNativeModuleApi); // "native"
builder.put("struct", structProvider);
builder.put("OutputGroupInfo", outputGroupInfoProvider);
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
index 8713119..042d863 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -78,10 +78,10 @@
import com.google.devtools.build.skydoc.fakebuildapi.FakeConfigApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeDefaultInfoProvider;
import com.google.devtools.build.skydoc.fakebuildapi.FakeOutputGroupInfo.FakeOutputGroupInfoProvider;
-import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkAttrApi;
-import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkCommandLineApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkNativeModuleApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkRuleFunctionsApi;
+import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkAttrModuleApi;
+import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkCommandLineApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi;
import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi.FakeStructProviderApi;
import com.google.devtools.build.skydoc.fakebuildapi.android.FakeAndroidApplicationResourceInfo.FakeAndroidApplicationResourceInfoProvider;
@@ -540,8 +540,8 @@
TopLevelBootstrap topLevelBootstrap =
new TopLevelBootstrap(
new FakeBuildApiGlobals(),
- new FakeSkylarkAttrApi(),
- new FakeSkylarkCommandLineApi(),
+ new FakeStarlarkAttrModuleApi(),
+ new FakeStarlarkCommandLineApi(),
new FakeSkylarkNativeModuleApi(),
new FakeSkylarkRuleFunctionsApi(ruleInfoList, providerInfoList, aspectInfoList),
new FakeStructProviderApi(),
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeDescriptor.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeDescriptor.java
index e0c8a6f..4bfb2f1 100644
--- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeDescriptor.java
+++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeDescriptor.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.skydoc.fakebuildapi;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAttrApi.Descriptor;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAttrModuleApi.Descriptor;
import com.google.devtools.build.lib.syntax.Printer;
import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.AttributeInfo;
import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.AttributeType;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkAttrApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java
similarity index 97%
rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkAttrApi.java
rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java
index 762c1fe..6eba2ed 100644
--- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkAttrApi.java
+++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAttrModuleApi.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.skydoc.fakebuildapi;
import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAttrApi;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAttrModuleApi;
import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi;
import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
@@ -30,9 +30,9 @@
import java.util.Map.Entry;
/**
- * Fake implementation of {@link SkylarkAttrApi}.
+ * Fake implementation of {@link StarlarkAttrModuleApi}.
*/
-public class FakeSkylarkAttrApi implements SkylarkAttrApi {
+public class FakeStarlarkAttrModuleApi implements StarlarkAttrModuleApi {
@Override
public Descriptor intAttribute(
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkCommandLineApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkCommandLineApi.java
similarity index 79%
rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkCommandLineApi.java
rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkCommandLineApi.java
index 4131014..5939ca8 100644
--- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkCommandLineApi.java
+++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkCommandLineApi.java
@@ -14,13 +14,13 @@
package com.google.devtools.build.skydoc.fakebuildapi;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkCommandLineApi;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkCommandLineApi;
import com.google.devtools.build.lib.syntax.Depset;
/**
- * Fake implementation of {@link SkylarkCommandLineApi}.
+ * Fake implementation of {@link StarlarkCommandLineApi}.
*/
-public class FakeSkylarkCommandLineApi implements SkylarkCommandLineApi {
+public class FakeStarlarkCommandLineApi implements StarlarkCommandLineApi {
@Override
public String joinPaths(String separator, Depset files) {
