bazel packages: rename StarlarkSemanticsOptions -> packages.semantics.BuildLanguageOptions
It is not a part of lib.packages, but a dependency of it;
some clients (e.g. skydoc) depend on it alone.
FYI: syntax.StarlarkSemantics does not have a code dependency on Bazel, but
it has many logical dependencies on Bazel concepts. Follow-up changes will
make StarlarkSemantics a base class, and define
packages.semantics.BuildLanguageSemantics as a Bazel-specific subclass
containing all Bazelisms.
PiperOrigin-RevId: 330004717
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java
index b1b9b46..8866ae0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/AbstractCollectPackagesUnderDirectoryTest.java
@@ -28,7 +28,7 @@
import com.google.devtools.build.lib.events.EventCollector;
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.packages.BuildFileName;
-import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -305,7 +305,7 @@
reporter,
packageOptions,
pathPackageLocator,
- Options.getDefaults(StarlarkSemanticsOptions.class),
+ Options.getDefaults(BuildLanguageOptions.class),
UUID.randomUUID(),
/*clientEnv=*/ ImmutableMap.of(),
new TimestampGranularityMonitor(BlazeClock.instance()),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
index 3c86386..e0803a0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -158,7 +158,7 @@
"//src/main/java/com/google/devtools/build/lib/exec:single_build_file_cache",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/packages:build_type",
- "//src/main/java/com/google/devtools/build/lib/packages:starlark_semantics_options",
+ "//src/main/java/com/google/devtools/build/lib/packages/semantics",
"//src/main/java/com/google/devtools/build/lib/packages:type",
"//src/main/java/com/google/devtools/build/lib/pkgcache",
"//src/main/java/com/google/devtools/build/lib/remote/options",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BuiltinsInjectionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BuiltinsInjectionTest.java
index 3cda7c50..70f9401 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BuiltinsInjectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BuiltinsInjectionTest.java
@@ -52,7 +52,7 @@
@Before
public void setUp() throws Exception {
- setStarlarkSemanticsOptions("--experimental_builtins_bzl_path=notdisabled");
+ setBuildLanguageOptions("--experimental_builtins_bzl_path=notdisabled");
}
/**
@@ -172,7 +172,7 @@
writePkgBzl(
"print('overridable_symbol :: ' + str(overridable_symbol))",
"print('overridable_rule :: ' + str(native.overridable_rule))");
- setStarlarkSemanticsOptions("--experimental_builtins_bzl_path=");
+ setBuildLanguageOptions("--experimental_builtins_bzl_path=");
buildDummyAndAssertSuccess();
assertContainsEvent("overridable_symbol :: original_value");
@@ -187,7 +187,7 @@
writePkgBzl(
"print('overridable_symbol :: ' + str(overridable_symbol))",
"print('overridable_rule :: ' + str(native.overridable_rule))");
- setStarlarkSemanticsOptions("--experimental_builtins_bzl_path=");
+ setBuildLanguageOptions("--experimental_builtins_bzl_path=");
buildDummyAndAssertSuccess();
assertContainsEvent("overridable_symbol :: original_value");
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
index e2e395d..2dfc450 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.BazelModuleContext;
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
-import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.BzlLoadFunction.BzlLoadFailedException;
@@ -73,7 +73,7 @@
ImmutableList.of(Root.fromPath(rootDirectory), Root.fromPath(alternativeRoot)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageOptions,
- Options.getDefaults(StarlarkSemanticsOptions.class),
+ Options.getDefaults(BuildLanguageOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
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 05157c5..1ae670a 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
@@ -42,7 +42,7 @@
import com.google.devtools.build.lib.packages.Package;
import com.google.devtools.build.lib.packages.PackageValidator;
import com.google.devtools.build.lib.packages.PackageValidator.InvalidPackageException;
-import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -107,11 +107,11 @@
private void preparePackageLoading(Path... roots) {
preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- Options.getDefaults(StarlarkSemanticsOptions.class), roots);
+ Options.getDefaults(BuildLanguageOptions.class), roots);
}
private void preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- StarlarkSemanticsOptions starlarkSemanticsOptions, Path... roots) {
+ BuildLanguageOptions starlarkSemanticsOptions, Path... roots) {
PackageOptions packageOptions = Options.getDefaults(PackageOptions.class);
packageOptions.defaultVisibility = ConstantRuleVisibility.PUBLIC;
packageOptions.showLoadingProgress = true;
@@ -450,7 +450,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageOptions,
- Options.getDefaults(StarlarkSemanticsOptions.class),
+ Options.getDefaults(BuildLanguageOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
tsgm);
@@ -963,7 +963,7 @@
@Test
public void testGlobAllowEmpty_starlarkOption() throws Exception {
preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=false")
+ Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=false")
.getOptions(),
rootDirectory);
@@ -1006,7 +1006,7 @@
@Test
public void testGlobDisallowEmpty_starlarkOption_wasNonEmptyAndBecomesEmpty() throws Exception {
preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+ Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
.getOptions(),
rootDirectory);
@@ -1065,7 +1065,7 @@
@Test
public void testGlobDisallowEmpty_starlarkOption_wasEmptyAndStaysEmpty() throws Exception {
preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+ Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
.getOptions(),
rootDirectory);
@@ -1129,7 +1129,7 @@
public void testGlobDisallowEmpty_starlarkOption_wasEmptyDueToExcludeAndStaysEmpty()
throws Exception {
preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+ Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
.getOptions(),
rootDirectory);
@@ -1190,7 +1190,7 @@
@Test
public void testGlobDisallowEmpty_starlarkOption_wasEmptyAndBecomesNonEmpty() throws Exception {
preparePackageLoadingWithCustomStarklarkSemanticsOptions(
- Options.parse(StarlarkSemanticsOptions.class, "--incompatible_disallow_empty_glob=true")
+ Options.parse(BuildLanguageOptions.class, "--incompatible_disallow_empty_glob=true")
.getOptions(),
rootDirectory);
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 5f706a3..bcd67b9 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
@@ -30,7 +30,7 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
@@ -104,7 +104,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
Options.getDefaults(PackageOptions.class),
- Options.getDefaults(StarlarkSemanticsOptions.class),
+ Options.getDefaults(BuildLanguageOptions.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 1aaae8f..887cc96 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
@@ -26,7 +26,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.StarlarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -427,7 +427,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageOptions,
- Options.getDefaults(StarlarkSemanticsOptions.class),
+ Options.getDefaults(BuildLanguageOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkFileContentHashTests.java b/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkFileContentHashTests.java
index 5242b21..2d872f3 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkFileContentHashTests.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/StarlarkFileContentHashTests.java
@@ -23,8 +23,8 @@
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.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
@@ -170,7 +170,7 @@
ImmutableList.of(Root.fromPath(rootDirectory)),
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY),
packageOptions,
- Options.getDefaults(StarlarkSemanticsOptions.class),
+ Options.getDefaults(BuildLanguageOptions.class),
UUID.randomUUID(),
ImmutableMap.<String, String>of(),
new TimestampGranularityMonitor(BlazeClock.instance()));
