Skylark -> Starlark for various methods, variables, constants, etc.
PiperOrigin-RevId: 312298717
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 aa8d0bd..abf181e 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
@@ -278,8 +278,8 @@
* Asserts that this aspect can only be evaluated for rules that supply all of the specified
* Starlark providers.
*/
- public Builder requireSkylarkProviders(StarlarkProviderIdentifier... skylarkProviders) {
- requiredProviders.addStarlarkSet(ImmutableSet.copyOf(skylarkProviders));
+ public Builder requireStarlarkProviders(StarlarkProviderIdentifier... starlarkProviders) {
+ requiredProviders.addStarlarkSet(ImmutableSet.copyOf(starlarkProviders));
return this;
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java b/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java
index 2e9a271..05c7f00 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java
@@ -66,7 +66,7 @@
// TODO(adonovan): clearly demarcate which fields are defined in which kinds of threads (loading,
// analysis, workspace, implicit outputs, computed defaults, etc), perhaps by splitting these into
// separate structs, exactly one of which is populated (plus the common fields). And eliminate
- // SkylarkUtils.Phase.
+ // StarlarkUtils.Phase.
// TODO(adonovan): move PackageFactory.PackageContext in here, for loading-phase threads.
// TODO(adonovan): add a PackageIdentifier here, for use by the Starlark Label function.
// TODO(adonovan): is there any reason not to put the entire RuleContext in this thread, for
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 0b96f4c..857b72d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -414,7 +414,7 @@
RootedPath buildFile,
StarlarkFile file,
Map<String, Module> loadedModules,
- ImmutableList<Label> skylarkFileDependencies,
+ ImmutableList<Label> starlarkFileDependencies,
RuleVisibility defaultVisibility,
StarlarkSemantics starlarkSemantics,
Globber globber)
@@ -431,7 +431,7 @@
defaultVisibility,
starlarkSemantics,
loadedModules,
- skylarkFileDependencies,
+ starlarkFileDependencies,
repositoryMapping);
} catch (InterruptedException e) {
globber.onInterrupt();
@@ -526,7 +526,7 @@
buildFile,
file,
/*loadedModules=*/ ImmutableMap.<String, Module>of(),
- /*skylarkFileDependencies=*/ ImmutableList.<Label>of(),
+ /*starlarkFileDependencies=*/ ImmutableList.<Label>of(),
/*defaultVisibility=*/ ConstantRuleVisibility.PUBLIC,
semantics,
globber)
@@ -702,7 +702,7 @@
RuleVisibility defaultVisibility,
StarlarkSemantics semantics,
Map<String, Module> loadedModules,
- ImmutableList<Label> skylarkFileDependencies,
+ ImmutableList<Label> starlarkFileDependencies,
ImmutableMap<RepositoryName, RepositoryName> repositoryMapping)
throws InterruptedException {
Package.Builder pkgBuilder =
@@ -718,7 +718,7 @@
// Let's give the BUILD file a chance to set default_visibility once,
// by resetting the PackageBuilder.defaultVisibilitySet flag.
.setDefaultVisibilitySet(false)
- .setStarlarkFileDependencies(skylarkFileDependencies)
+ .setStarlarkFileDependencies(starlarkFileDependencies)
.setWorkspaceName(workspaceName)
.setThirdPartyLicenceExistencePolicy(
ruleClassProvider.getThirdPartyLicenseExistencePolicy());
@@ -823,7 +823,7 @@
/*analysisRuleLabel=*/ null)
.storeInThread(thread);
- // TODO(adonovan): save this as a field in BazelSkylarkContext.
+ // TODO(adonovan): save this as a field in BazelStarlarkContext.
// It needn't be a second thread-local.
thread.setThreadLocal(PackageContext.class, pkgContext);
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 2797f0d..2c964ef 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
@@ -272,7 +272,7 @@
* @param rule a rule instance to get tags from
* @param allowTagsPropagation if set to true, tags will be propagated from a target to the
* actions' execution requirements, for more details {@see
- * SkylarkSematicOptions#experimentalAllowTagsPropagation}
+ * StarlarkSematicOptions#experimentalAllowTagsPropagation}
*/
public static ImmutableMap<String, String> getFilteredExecutionInfo(
@Nullable Object executionRequirementsUnchecked, Rule rule, boolean allowTagsPropagation)
