Rename SkylarkSemanticsOptions to StarlarkSemanticsOptions
RELNOTES: None.
PiperOrigin-RevId: 234484830
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 00a0f4b..b4dc6e1 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -421,7 +421,7 @@
java_library(
name = "skylark_semantics_options",
srcs = [
- "packages/SkylarkSemanticsOptions.java",
+ "packages/StarlarkSemanticsOptions.java",
],
deps = [
":skylark_semantics",
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
index 54b5b6f..87cf21a 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.exec.ExecutionOptions;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.runtime.BlazeCommandEventHandler;
@@ -76,7 +76,7 @@
ImmutableList.of(
BuildRequestOptions.class,
PackageCacheOptions.class,
- SkylarkSemanticsOptions.class,
+ StarlarkSemanticsOptions.class,
LoadingOptions.class,
AnalysisOptions.class,
ExecutionOptions.class,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
similarity index 98%
rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 1348c53e..3a6b50d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -25,11 +25,11 @@
import java.util.List;
/**
- * Contains options that affect Skylark's semantics.
+ * Contains options that affect Starlark's semantics.
*
* <p>These are injected into Skyframe (as an instance of {@link StarlarkSemantics}) when a new
* build invocation occurs. Changing these options between builds will therefore trigger a
- * reevaluation of everything that depends on the Skylark interpreter — in particular,
+ * reevaluation of everything that depends on the Starlark interpreter — in particular,
* evaluation of all BUILD and .bzl files.
*
* <p><em>To add a new option, update the following:</em>
@@ -56,7 +56,7 @@
* must be kept consistent; to make it easy we use alphabetic order. The parts that need updating
* are marked with the comment "<== Add new options here in alphabetic order ==>".
*/
-public class SkylarkSemanticsOptions extends OptionsBase implements Serializable {
+public class StarlarkSemanticsOptions extends OptionsBase implements Serializable {
// <== Add new options here in alphabetic order ==>
@@ -112,7 +112,7 @@
+ "is enabled by default.")
public boolean experimentalEnableRepoMapping;
- // This flag is declared in SkylarkSemanticsOptions instead of JavaOptions because there is no
+ // This flag is declared in StarlarkSemanticsOptions instead of JavaOptions because there is no
// way to retrieve the java configuration from the Java implementation of
// java_common.create_provider.
@Option(
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
index 6522674..4982415 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
@@ -17,7 +17,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.util.ResourceFileLoader;
import com.google.devtools.common.options.OptionsBase;
import com.google.devtools.common.options.OptionsParser;
@@ -47,7 +47,7 @@
ClientOptions.class,
// Skylark options aren't applicable to all commands, but making them a common option
// allows users to put them in the common section of the bazelrc. See issue #3538.
- SkylarkSemanticsOptions.class);
+ StarlarkSemanticsOptions.class);
private BlazeCommandUtils() {}
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 87daa27..40874f3 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.events.Reporter;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -575,7 +575,7 @@
reporter,
options.getOptions(PackageCacheOptions.class),
packageLocator,
- options.getOptions(SkylarkSemanticsOptions.class),
+ options.getOptions(StarlarkSemanticsOptions.class),
getCommandId(),
clientEnv,
timestampGranularityMonitor,
@@ -583,13 +583,13 @@
}
public void syncPackageLoading(
- PackageCacheOptions packageCacheOptions, SkylarkSemanticsOptions skylarkSemanticsOptions)
+ PackageCacheOptions packageCacheOptions, StarlarkSemanticsOptions starlarkSemanticsOptions)
throws AbruptExitException {
getSkyframeExecutor()
.syncPackageLoading(
packageCacheOptions,
packageLocator,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
getCommandId(),
clientEnv,
timestampGranularityMonitor);
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java b/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java
index 8e68bf5..9202955 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.packages.BuildSetting;
import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -93,7 +93,7 @@
try {
env.syncPackageLoading(
optionsParser.getOptions(PackageCacheOptions.class),
- optionsParser.getOptions(SkylarkSemanticsOptions.class));
+ optionsParser.getOptions(StarlarkSemanticsOptions.class));
} catch (AbruptExitException e) {
throw new OptionsParsingException(e.getMessage());
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index 1c051f3..cfdd260 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -51,7 +51,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.profiler.Profiler;
@@ -296,7 +296,7 @@
ExtendedEventHandler eventHandler,
PackageCacheOptions packageCacheOptions,
PathPackageLocator packageLocator,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm,
@@ -312,7 +312,7 @@
eventHandler,
packageCacheOptions,
packageLocator,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
commandId,
clientEnv,
tsgm,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 7fd6e4f..47c9c20 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -110,7 +110,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.RuleVisibility;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
@@ -1296,7 +1296,7 @@
public void preparePackageLoading(
PathPackageLocator pkgLocator,
PackageCacheOptions packageCacheOptions,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm) {
@@ -1309,7 +1309,7 @@
this.clientEnv.set(clientEnv);
setShowLoadingProgress(packageCacheOptions.showLoadingProgress);
setDefaultVisibility(packageCacheOptions.defaultVisibility);
- setSkylarkSemantics(skylarkSemanticsOptions.toSkylarkSemantics());
+ setSkylarkSemantics(starlarkSemanticsOptions.toSkylarkSemantics());
setPackageLocator(pkgLocator);
syscalls.set(getPerBuildSyscallCache(packageCacheOptions.globbingThreads));
@@ -2398,7 +2398,7 @@
ExtendedEventHandler eventHandler,
PackageCacheOptions packageCacheOptions,
PathPackageLocator pathPackageLocator,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm,
@@ -2408,7 +2408,7 @@
syncPackageLoading(
packageCacheOptions,
pathPackageLocator,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
commandId,
clientEnv,
tsgm);
@@ -2421,7 +2421,7 @@
public void syncPackageLoading(
PackageCacheOptions packageCacheOptions,
PathPackageLocator pathPackageLocator,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm)
@@ -2430,7 +2430,7 @@
preparePackageLoading(
pathPackageLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
commandId,
clientEnv,
tsgm);
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 75e67cb..4c45d63 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -24,11 +24,11 @@
/**
* Options that affect Starlark semantics.
*
- * <p>For descriptions of what these options do, see {@link SkylarkSemanticsOptions}.
+ * <p>For descriptions of what these options do, see {@link StarlarkSemanticsOptions}.
*/
// TODO(brandjon): User error messages that reference options should maybe be substituted with the
// option name outside of the core Starlark interpreter?
-// TODO(brandjon): Eventually these should be documented in full here, and SkylarkSemanticsOptions
+// TODO(brandjon): Eventually these should be documented in full here, and StarlarkSemanticsOptions
// should refer to this class for documentation. But this doesn't play nice with the options
// parser's annotation mechanism.
@AutoValue
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 aec67e8..e3da545 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.events.EventHandler;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.skylarkbuildapi.TopLevelBootstrap;
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidAssetsInfoApi;
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidBinaryDataInfoApi;
@@ -158,9 +158,9 @@
public static void main(String[] args)
throws IOException, InterruptedException, LabelSyntaxException {
OptionsParser parser =
- OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class, SkydocOptions.class);
+ OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class, SkydocOptions.class);
parser.parseAndExitUponError(args);
- SkylarkSemanticsOptions semanticsOptions = parser.getOptions(SkylarkSemanticsOptions.class);
+ StarlarkSemanticsOptions semanticsOptions = parser.getOptions(StarlarkSemanticsOptions.class);
SkydocOptions skydocOptions = parser.getOptions(SkydocOptions.class);
String targetFileLabelString;
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index cd074b3..444ce0d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -54,7 +54,7 @@
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.packages.NativeAspectClass;
import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
@@ -232,7 +232,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
@@ -275,7 +275,7 @@
Arrays.asList(
ExecutionOptions.class,
PackageCacheOptions.class,
- SkylarkSemanticsOptions.class,
+ StarlarkSemanticsOptions.class,
BuildRequestOptions.class,
AnalysisOptions.class,
KeepGoingOption.class,
@@ -360,13 +360,13 @@
packageCacheOptions.showLoadingProgress = true;
packageCacheOptions.globbingThreads = 7;
- SkylarkSemanticsOptions skylarkSemanticsOptions =
- optionsParser.getOptions(SkylarkSemanticsOptions.class);
+ StarlarkSemanticsOptions starlarkSemanticsOptions =
+ optionsParser.getOptions(StarlarkSemanticsOptions.class);
skyframeExecutor.preparePackageLoading(
pathPackageLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 25dafac..1c99bdb 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -123,7 +123,7 @@
import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.RawAttributeMapper;
import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
@@ -202,7 +202,7 @@
protected OptionsParser optionsParser;
private PackageCacheOptions packageCacheOptions;
- private SkylarkSemanticsOptions skylarkSemanticsOptions;
+ private StarlarkSemanticsOptions starlarkSemanticsOptions;
protected PackageFactory pkgFactory;
protected MockToolsConfig mockToolsConfig;
@@ -243,7 +243,7 @@
initializeMockClient();
packageCacheOptions = parsePackageCacheOptions();
- skylarkSemanticsOptions = parseSkylarkSemanticsOptions();
+ starlarkSemanticsOptions = parseSkylarkSemanticsOptions();
workspaceStatusActionFactory = new AnalysisTestUtil.DummyWorkspaceStatusActionFactory();
mutableActionGraph = new MapBasedActionGraph(actionKeyContext);
ruleClassProvider = getRuleClassProvider();
@@ -297,7 +297,7 @@
ImmutableList.of(root),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
tsgm);
@@ -334,7 +334,7 @@
}
protected StarlarkSemantics getSkylarkSemantics() {
- return skylarkSemanticsOptions.toSkylarkSemantics();
+ return starlarkSemanticsOptions.toSkylarkSemantics();
}
protected ResourceSet getStartingResources() {
@@ -414,7 +414,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
tsgm);
@@ -439,7 +439,7 @@
}
protected void setSkylarkSemanticsOptions(String... options) throws Exception {
- skylarkSemanticsOptions = parseSkylarkSemanticsOptions(options);
+ starlarkSemanticsOptions = parseSkylarkSemanticsOptions(options);
setUpSkyframe();
}
@@ -450,11 +450,11 @@
return parser.getOptions(PackageCacheOptions.class);
}
- private static SkylarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
+ private static StarlarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
throws Exception {
- OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+ OptionsParser parser = OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class);
parser.parse(options);
- return parser.getOptions(SkylarkSemanticsOptions.class);
+ return parser.getOptions(StarlarkSemanticsOptions.class);
}
/** Used by skyframe-only tests. */
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 64ada7a..1eac500 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -34,7 +34,7 @@
import com.google.devtools.build.lib.clock.BlazeClock;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -171,7 +171,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
index d73007d..06f3762 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -32,7 +32,7 @@
import org.junit.runners.JUnit4;
/**
- * Tests for the flow of flags from {@link SkylarkSemanticsOptions} to {@link StarlarkSemantics},
+ * Tests for the flow of flags from {@link StarlarkSemanticsOptions} to {@link StarlarkSemantics},
* and to and from {@code StarlarkSemantics}' serialized representation.
*
* <p>When adding a new option, it is trivial to make a transposition error or a copy/paste error.
@@ -40,10 +40,10 @@
*
* <ul>
* <li>If a new option is added to {@code StarlarkSemantics} but not to {@code
- * SkylarkSemanticsOptions}, or vice versa, then the programmer will either be unable to
+ * StarlarkSemanticsOptions}, or vice versa, then the programmer will either be unable to
* implement its behavior, or unable to test it from the command line and add user
* documentation. We hope that the programmer notices this on their own.
- * <li>If {@link SkylarkSemanticsOptions#toSkylarkSemantics} is not updated to set all fields of
+ * <li>If {@link StarlarkSemanticsOptions#toSkylarkSemantics} is not updated to set all fields of
* {@code StarlarkSemantics}, then it will fail immediately because all fields of {@link
* StarlarkSemantics.Builder} are mandatory.
* <li>To catch a copy/paste error where the wrong field's data is threaded through {@code
@@ -61,14 +61,14 @@
private static final int NUM_RANDOM_TRIALS = 10;
/**
- * Checks that a randomly generated {@link SkylarkSemanticsOptions} object can be converted to a
+ * Checks that a randomly generated {@link StarlarkSemanticsOptions} object can be converted to a
* {@link StarlarkSemantics} object with the same field values.
*/
@Test
public void optionsToSemantics() throws Exception {
for (int i = 0; i < NUM_RANDOM_TRIALS; i++) {
long seed = i;
- SkylarkSemanticsOptions options = buildRandomOptions(new Random(seed));
+ StarlarkSemanticsOptions options = buildRandomOptions(new Random(seed));
StarlarkSemantics semantics = buildRandomSemantics(new Random(seed));
StarlarkSemantics semanticsFromOptions = options.toSkylarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(semantics);
@@ -96,7 +96,7 @@
@Test
public void checkDefaultsMatch() {
- SkylarkSemanticsOptions defaultOptions = Options.getDefaults(SkylarkSemanticsOptions.class);
+ StarlarkSemanticsOptions defaultOptions = Options.getDefaults(StarlarkSemanticsOptions.class);
StarlarkSemantics defaultSemantics = StarlarkSemantics.DEFAULT_SEMANTICS;
StarlarkSemantics semanticsFromOptions = defaultOptions.toSkylarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(defaultSemantics);
@@ -111,11 +111,11 @@
}
/**
- * Constructs a {@link SkylarkSemanticsOptions} object with random fields. Must access {@code
+ * Constructs a {@link StarlarkSemanticsOptions} object with random fields. Must access {@code
* rand} using the same sequence of operations (for the same fields) as {@link
* #buildRandomSemantics}.
*/
- private static SkylarkSemanticsOptions buildRandomOptions(Random rand) throws Exception {
+ private static StarlarkSemanticsOptions buildRandomOptions(Random rand) throws Exception {
return parseOptions(
// <== Add new options here in alphabetic order ==>
"--check_third_party_targets_have_licenses=" + rand.nextBoolean(),
@@ -212,11 +212,11 @@
.build();
}
- private static SkylarkSemanticsOptions parseOptions(String... args) throws Exception {
- OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+ private static StarlarkSemanticsOptions parseOptions(String... args) throws Exception {
+ OptionsParser parser = OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class);
parser.setAllowResidue(false);
parser.parse(Arrays.asList(args));
- return parser.getOptions(SkylarkSemanticsOptions.class);
+ return parser.getOptions(StarlarkSemanticsOptions.class);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
index a8ecff3..437a0cf 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
@@ -120,9 +120,9 @@
private static StarlarkSemantics parseSkylarkSemanticsOptions(String... options)
throws Exception {
- OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+ OptionsParser parser = OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class);
parser.parse(options);
- return parser.getOptions(SkylarkSemanticsOptions.class).toSkylarkSemantics();
+ return parser.getOptions(StarlarkSemanticsOptions.class).toSkylarkSemantics();
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index f1e1f8d..9928b46 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -30,7 +30,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.PackageFactory.LegacyGlobber;
import com.google.devtools.build.lib.packages.RuleClassProvider;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.syntax.BuildFileAST;
import com.google.devtools.build.lib.syntax.Environment.Extension;
import com.google.devtools.build.lib.syntax.ParserInputSource;
@@ -101,13 +101,13 @@
String skylarkOption)
throws Exception {
- OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+ OptionsParser parser = OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class);
parser.parse(
skylarkOption == null
? ImmutableList.<String>of()
: ImmutableList.<String>of(skylarkOption));
StarlarkSemantics semantics =
- parser.getOptions(SkylarkSemanticsOptions.class).toSkylarkSemantics();
+ parser.getOptions(StarlarkSemanticsOptions.class).toSkylarkSemantics();
try {
Package externalPkg =
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
index caa6485..c0105a4 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageLoadingTestCase.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleVisibility;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
@@ -72,7 +72,7 @@
protected LoadingMock loadingMock;
private PackageCacheOptions packageCacheOptions;
- private SkylarkSemanticsOptions skylarkSemanticsOptions;
+ private StarlarkSemanticsOptions starlarkSemanticsOptions;
protected ConfiguredRuleClassProvider ruleClassProvider;
protected PackageFactory packageFactory;
protected SkyframeExecutor skyframeExecutor;
@@ -83,7 +83,7 @@
public final void initializeSkyframeExecutor() throws Exception {
loadingMock = LoadingMock.get();
packageCacheOptions = parsePackageCacheOptions();
- skylarkSemanticsOptions = parseSkylarkSemanticsOptions();
+ starlarkSemanticsOptions = parseSkylarkSemanticsOptions();
List<RuleDefinition> extraRules = getExtraRules();
if (!extraRules.isEmpty()) {
ConfiguredRuleClassProvider.Builder builder = new ConfiguredRuleClassProvider.Builder();
@@ -162,7 +162,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
@@ -183,7 +183,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
@@ -199,11 +199,11 @@
return parser.getOptions(PackageCacheOptions.class);
}
- private static SkylarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
+ private static StarlarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
throws Exception {
- OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+ OptionsParser parser = OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class);
parser.parse(options);
- return parser.getOptions(SkylarkSemanticsOptions.class);
+ return parser.getOptions(StarlarkSemanticsOptions.class);
}
protected void setPackageCacheOptions(String... options) throws Exception {
@@ -212,7 +212,7 @@
}
protected void setSkylarkSemanticsOptions(String... options) throws Exception {
- skylarkSemanticsOptions = parseSkylarkSemanticsOptions(options);
+ starlarkSemanticsOptions = parseSkylarkSemanticsOptions(options);
setUpSkyframe();
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
index 9e23729..88a746d 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BuildFileModificationTest.java
@@ -28,7 +28,7 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.packages.NoSuchPackageException;
import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
@@ -109,17 +109,16 @@
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE,
Optional.<RootedPath>absent())));
TestConstants.processSkyframeExecutorForTesting(skyframeExecutor);
- OptionsParser parser = OptionsParser.newOptionsParser(
- PackageCacheOptions.class, SkylarkSemanticsOptions.class);
+ OptionsParser parser =
+ OptionsParser.newOptionsParser(PackageCacheOptions.class, StarlarkSemanticsOptions.class);
analysisMock.getInvocationPolicyEnforcer().enforce(parser);
setUpSkyframe(
parser.getOptions(PackageCacheOptions.class),
- parser.getOptions(SkylarkSemanticsOptions.class));
+ parser.getOptions(StarlarkSemanticsOptions.class));
}
private void setUpSkyframe(
- PackageCacheOptions packageCacheOptions,
- SkylarkSemanticsOptions skylarkSemanticsOptions) {
+ PackageCacheOptions packageCacheOptions, StarlarkSemanticsOptions starlarkSemanticsOptions) {
PathPackageLocator pkgLocator =
PathPackageLocator.create(
null,
@@ -133,7 +132,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(clock));
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index 8df1006..acbf8f7 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -36,7 +36,7 @@
import com.google.devtools.build.lib.packages.NoSuchThingException;
import com.google.devtools.build.lib.packages.Package;
import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.LoadingMock;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -513,7 +513,7 @@
ImmutableList.of(Root.fromPath(workspace)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
@@ -603,7 +603,7 @@
ImmutableList.of(Root.fromPath(workspace)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index d2eec94..7cb82ad 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -46,7 +46,7 @@
import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -1134,7 +1134,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(clock));
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
index d7ebec3..d62ee07 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -35,7 +35,7 @@
import com.google.devtools.build.lib.packages.NoSuchTargetException;
import com.google.devtools.build.lib.packages.Package;
import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
@@ -124,7 +124,7 @@
}
private void setUpSkyframe(
- PackageCacheOptions packageCacheOptions, SkylarkSemanticsOptions skylarkSemanticsOptions) {
+ PackageCacheOptions packageCacheOptions, StarlarkSemanticsOptions starlarkSemanticsOptions) {
PathPackageLocator pkgLocator =
PathPackageLocator.create(
null,
@@ -143,7 +143,7 @@
skyframeExecutor.preparePackageLoading(
pkgLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
@@ -154,7 +154,7 @@
private OptionsParser parse(String... options) throws Exception {
OptionsParser parser =
- OptionsParser.newOptionsParser(PackageCacheOptions.class, SkylarkSemanticsOptions.class);
+ OptionsParser.newOptionsParser(PackageCacheOptions.class, StarlarkSemanticsOptions.class);
parser.parse("--default_visibility=public");
parser.parse(options);
@@ -172,8 +172,9 @@
return parse(options).getOptions(PackageCacheOptions.class);
}
- private SkylarkSemanticsOptions parseSkylarkSemanticsOptions(String... options) throws Exception {
- return parse(options).getOptions(SkylarkSemanticsOptions.class);
+ private StarlarkSemanticsOptions parseSkylarkSemanticsOptions(String... options)
+ throws Exception {
+ return parse(options).getOptions(StarlarkSemanticsOptions.class);
}
protected void setOptions(String... options) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
index 32a890f..9fb518d 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
@@ -17,7 +17,7 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.common.options.Option;
import com.google.devtools.common.options.OptionDocumentationCategory;
@@ -135,7 +135,7 @@
result.add(BlazeCommandEventHandler.Options.class);
result.add(CommonCommandOptions.class);
result.add(ClientOptions.class);
- result.add(SkylarkSemanticsOptions.class);
+ result.add(StarlarkSemanticsOptions.class);
return result;
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
index 9c00e7f..2e39ef8 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.NoSuchPackageException;
import com.google.devtools.build.lib.packages.NoSuchTargetException;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -91,7 +91,7 @@
Arrays.stream(roots).map(Root::fromPath).collect(ImmutableList.toImmutableList()),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
@@ -340,7 +340,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
tsgm);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
index 7d3dd44..8a86c99 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.events.Reporter;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -106,7 +106,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
Options.getDefaults(PackageCacheOptions.class),
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(null));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java
index f892ae6..1756184 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeLabelVisitorTest.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.events.EventHandler;
import com.google.devtools.build.lib.events.EventKind;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -411,7 +411,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
index 0d7024d..320f35f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkFileContentHashTests.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -169,7 +169,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
index da9f33c..7bfcddc 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunctionTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.clock.BlazeClock;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.SkylarkImportLookupFunction.SkylarkImportFailedException;
@@ -63,7 +63,7 @@
ImmutableList.of(Root.fromPath(rootDirectory), Root.fromPath(alternativeRoot)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageCacheOptions,
- Options.getDefaults(SkylarkSemanticsOptions.class),
+ Options.getDefaults(StarlarkSemanticsOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
index c47347b..fa21f9b 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkOptionsParsingTest.java
@@ -20,7 +20,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.events.StoredEventHandler;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.runtime.BlazeCommand;
@@ -55,7 +55,7 @@
private static final List<Class<? extends OptionsBase>> requiredOptionsClasses =
ImmutableList.of(
PackageCacheOptions.class,
- SkylarkSemanticsOptions.class,
+ StarlarkSemanticsOptions.class,
KeepGoingOption.class,
LoadingOptions.class,
ClientOptions.class,
@@ -77,7 +77,7 @@
builds = true,
options = {
PackageCacheOptions.class,
- SkylarkSemanticsOptions.class,
+ StarlarkSemanticsOptions.class,
KeepGoingOption.class,
LoadingOptions.class,
ClientOptions.class,
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
index cbd33fe..cca7363 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
@@ -16,7 +16,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.analysis.skylark.SkylarkModules;
import com.google.devtools.build.lib.events.EventHandler;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.syntax.Environment;
import com.google.devtools.build.lib.syntax.Environment.GlobalFrame;
import com.google.devtools.build.lib.syntax.Mutability;
@@ -31,9 +31,9 @@
public abstract class TestMode {
private static StarlarkSemantics parseSkylarkSemantics(String... skylarkOptions)
throws Exception {
- OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
+ OptionsParser parser = OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class);
parser.parse(skylarkOptions);
- return parser.getOptions(SkylarkSemanticsOptions.class).toSkylarkSemantics();
+ return parser.getOptions(StarlarkSemanticsOptions.class).toSkylarkSemantics();
}
public static final TestMode BUILD =
diff --git a/src/test/shell/integration/skylark_flag_test.sh b/src/test/shell/integration/skylark_flag_test.sh
index 10c2157..8b694b0 100755
--- a/src/test/shell/integration/skylark_flag_test.sh
+++ b/src/test/shell/integration/skylark_flag_test.sh
@@ -18,7 +18,7 @@
# line, in several different evaluation contexts.
#
# The --internal_skylark_flag_test_canary flag is built into
-# SkylarkSemanticsOptions specifically for this test suite.
+# StarlarkSemanticsOptions specifically for this test suite.
# --- begin runfiles.bash initialization ---
# Copy-pasted from Bazel's Bash runfiles library (tools/bash/runfiles/runfiles.bash).
