bazel syntax: rename StarlarkSemantics.DEFAULT_SEMANTICS -> DEFAULT
It's a mouthful.
Another breaking API change for Copybara. Sorry. One day this will all be over.
PiperOrigin-RevId: 310600957
diff --git a/src/main/java/com/google/devtools/build/docgen/ApiExporter.java b/src/main/java/com/google/devtools/build/docgen/ApiExporter.java
index b8f47f1..02886c4 100644
--- a/src/main/java/com/google/devtools/build/docgen/ApiExporter.java
+++ b/src/main/java/com/google/devtools/build/docgen/ApiExporter.java
@@ -116,7 +116,7 @@
StarlarkBuiltin typeModule = StarlarkInterfaceUtils.getStarlarkBuiltin(obj.getClass());
if (typeModule != null) {
Method selfCallMethod =
- CallUtils.getSelfCallMethod(StarlarkSemantics.DEFAULT_SEMANTICS, obj.getClass());
+ CallUtils.getSelfCallMethod(StarlarkSemantics.DEFAULT, obj.getClass());
if (selfCallMethod != null) {
// selfCallMethod may be from a subclass of the annotated method.
SkylarkCallable annotation = StarlarkInterfaceUtils.getSkylarkCallable(selfCallMethod);
diff --git a/src/main/java/com/google/devtools/build/docgen/StarlarkDocumentationCollector.java b/src/main/java/com/google/devtools/build/docgen/StarlarkDocumentationCollector.java
index 6b6af98..35ceb25 100644
--- a/src/main/java/com/google/devtools/build/docgen/StarlarkDocumentationCollector.java
+++ b/src/main/java/com/google/devtools/build/docgen/StarlarkDocumentationCollector.java
@@ -179,8 +179,7 @@
@Nullable
private static Method getSelfCallConstructorMethod(Class<?> objectClass) {
- Method selfCallMethod =
- CallUtils.getSelfCallMethod(StarlarkSemantics.DEFAULT_SEMANTICS, objectClass);
+ Method selfCallMethod = CallUtils.getSelfCallMethod(StarlarkSemantics.DEFAULT, objectClass);
if (selfCallMethod != null && selfCallMethod.isAnnotationPresent(SkylarkConstructor.class)) {
return selfCallMethod;
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java b/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
index 1d256b4..5358e42 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
@@ -35,7 +35,7 @@
// TODO(adonovan): logically this should be a parameter of getValue
// and getFieldNames or an instance field of this object.
- private static final StarlarkSemantics SEMANTICS = StarlarkSemantics.DEFAULT_SEMANTICS;
+ private static final StarlarkSemantics SEMANTICS = StarlarkSemantics.DEFAULT;
@Override
public Object getValue(String name) throws EvalException {
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 dae3dc6..2fa199c 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
@@ -473,15 +473,10 @@
.getRootRelativePath()
.getRelative(LabelConstants.WORKSPACE_FILE_NAME)),
"TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ StarlarkSemantics.DEFAULT)
.build();
return createPackageForTesting(
- packageId,
- externalPkg,
- buildFile,
- locator,
- eventHandler,
- StarlarkSemantics.DEFAULT_SEMANTICS);
+ packageId, externalPkg, buildFile, locator, eventHandler, StarlarkSemantics.DEFAULT);
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index dd0ff29..cc12e5c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -40,7 +40,7 @@
* <ul>
* <li>Add a new abstract method (which is interpreted by {@code AutoValue} as a field) to {@link
* StarlarkSemantics} and {@link StarlarkSemantics.Builder}. Set its default value in {@link
- * StarlarkSemantics#DEFAULT_SEMANTICS}.
+ * StarlarkSemantics#DEFAULT}.
* <li>Add a new {@code @Option}-annotated field to this class. The field name and default value
* should be the same as in {@link StarlarkSemantics}, and the option name in the annotation
* should be that name written in snake_case. Add a line to set the new field in {@link
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index e2f1cf7..d4cb03c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -410,7 +410,7 @@
// configured by flags.
return WorkspaceFactory.newNativeModule(
WorkspaceFactory.createWorkspaceFunctions(
- false, ruleFactory, workspaceGlobals, StarlarkSemantics.DEFAULT_SEMANTICS),
+ false, ruleFactory, workspaceGlobals, StarlarkSemantics.DEFAULT),
version);
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index 7661fec..85526aa 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -188,7 +188,7 @@
}
public Builder useDefaultSkylarkSemantics() {
- this.starlarkSemantics = StarlarkSemantics.DEFAULT_SEMANTICS;
+ this.starlarkSemantics = StarlarkSemantics.DEFAULT;
return this;
}
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
index 7227560..2b0d5fe 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
@@ -129,8 +129,7 @@
private static ImmutableList<Value> getChildren(
ThreadObjectMap objectMap, StarlarkValue skylarkValue) {
- StarlarkSemantics semantics =
- StarlarkSemantics.DEFAULT_SEMANTICS; // TODO(adonovan): obtain from thread.
+ StarlarkSemantics semantics = StarlarkSemantics.DEFAULT; // TODO(adonovan): obtain from thread.
Set<String> fieldNames;
try {
fieldNames = CallUtils.getFieldNames(semantics, skylarkValue);
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java
index a3689a8..3f13aa6 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java
@@ -85,7 +85,7 @@
*/
@Deprecated
public SkylarkCallable getAnnotation() {
- return getMethodDescriptor(StarlarkSemantics.DEFAULT_SEMANTICS).getAnnotation();
+ return getMethodDescriptor(StarlarkSemantics.DEFAULT).getAnnotation();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/CallUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/CallUtils.java
index 1118ea8..714c45b 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/CallUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/CallUtils.java
@@ -158,7 +158,7 @@
Class<?> objClass) {
ImmutableMap.Builder<Method, SkylarkCallable> result = ImmutableMap.builder();
for (MethodDescriptor desc :
- getCacheValue(objClass, StarlarkSemantics.DEFAULT_SEMANTICS).methods.values()) {
+ getCacheValue(objClass, StarlarkSemantics.DEFAULT).methods.values()) {
result.put(desc.getMethod(), desc.getAnnotation());
}
return result.build();
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java b/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java
index 046906f..aede8ca 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java
@@ -444,9 +444,9 @@
return new EvalException(null, String.format(format, args));
}
- /** Equivalent to {@code addMethods(env, v, DEFAULT_SEMANTICS)}. */
+ /** Equivalent to {@code addMethods(env, v, StarlarkSemantics.DEFAULT)}. */
public static void addMethods(ImmutableMap.Builder<String, Object> env, Object v) {
- addMethods(env, v, StarlarkSemantics.DEFAULT_SEMANTICS);
+ addMethods(env, v, StarlarkSemantics.DEFAULT);
}
/**
@@ -465,7 +465,7 @@
for (String name : CallUtils.getMethodNames(semantics, v.getClass())) {
// We use the 2-arg (desc=null) BuiltinCallable constructor instead of passing
// the descriptor that CallUtils.getMethod would return,
- // because most calls to addMethods pass DEFAULT_SEMANTICS,
+ // because most calls to addMethods pass StarlarkSemantics.DEFAULT,
// which is probably incorrect for the call.
// The effect is that the default semantics determine which methods appear in
// env, but the thread's semantics determine which method calls succeed.
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 a1d9e2b..8152dc7 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
@@ -308,10 +308,10 @@
/** Returns a {@link Builder} initialized with default values for all options. */
public static Builder builderWithDefaults() {
- return DEFAULT_SEMANTICS.toBuilder();
+ return DEFAULT.toBuilder();
}
- public static final StarlarkSemantics DEFAULT_SEMANTICS =
+ public static final StarlarkSemantics DEFAULT =
builder()
// <== Add new options here in alphabetic order ==>
.debugDepsetDepth(false)
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkThread.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkThread.java
index 865cc1b..e1a03d1 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkThread.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkThread.java
@@ -402,7 +402,7 @@
}
public Builder useDefaultSemantics() {
- this.semantics = StarlarkSemantics.DEFAULT_SEMANTICS;
+ this.semantics = StarlarkSemantics.DEFAULT;
return this;
}
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 115bf3e..f24c2bc 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
@@ -265,7 +265,7 @@
ImmutableList<PrecomputedValue.Injected> extraPrecomputedValues =
ImmutableList.of(
PrecomputedValue.injected(
- PrecomputedValue.STARLARK_SEMANTICS, StarlarkSemantics.DEFAULT_SEMANTICS),
+ PrecomputedValue.STARLARK_SEMANTICS, StarlarkSemantics.DEFAULT),
PrecomputedValue.injected(PrecomputedValue.REPO_ENV, ImmutableMap.<String, String>of()),
PrecomputedValue.injected(
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES,
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContextTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContextTest.java
index f8c75de..d75521e 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContextTest.java
@@ -173,7 +173,7 @@
setUpContextForRule(
ImmutableMap.of("name", name),
ImmutableSet.of(),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
/* repoRemoteExecutor= */ null);
}
@@ -182,7 +182,7 @@
setUpContextForRule(
ImmutableMap.of("name", "test", "foo", "bar"),
ImmutableSet.of(),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
/* repoRemoteExecutor= */ null,
Attribute.attr("foo", Type.STRING).build());
@@ -280,7 +280,7 @@
setUpContextForRule(
ImmutableMap.of("name", "test"),
ImmutableSet.of(PathFragment.create("under_workspace")),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
/* repoRemoteExecutor= */ null);
assertThat(context.delete(underWorkspace.toString(), thread)).isTrue();
}
diff --git a/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java b/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java
index a081c01..1e156e3 100644
--- a/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java
+++ b/src/test/java/com/google/devtools/build/lib/cmdline/LabelTest.java
@@ -466,10 +466,9 @@
@Test
public void testGetWorkspaceRoot() throws Exception {
Label label = Label.parseAbsolute("//bar/baz", ImmutableMap.of());
- assertThat(label.getWorkspaceRoot(StarlarkSemantics.DEFAULT_SEMANTICS)).isEmpty();
+ assertThat(label.getWorkspaceRoot(StarlarkSemantics.DEFAULT)).isEmpty();
label = Label.parseAbsolute("@repo//bar/baz", ImmutableMap.of());
- assertThat(label.getWorkspaceRoot(StarlarkSemantics.DEFAULT_SEMANTICS))
- .isEqualTo("external/repo");
+ assertThat(label.getWorkspaceRoot(StarlarkSemantics.DEFAULT)).isEqualTo("external/repo");
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
index 44870d0..a4104f1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/PackageFactoryTest.java
@@ -497,10 +497,7 @@
packages
.factory()
.afterDoneLoadingPackage(
- pkg,
- StarlarkSemantics.DEFAULT_SEMANTICS,
- /*loadTimeNanos=*/ 0,
- eventHandler));
+ pkg, StarlarkSemantics.DEFAULT, /*loadTimeNanos=*/ 0, eventHandler));
assertThat(expected).hasMessageThat().contains("no such package 'x': nope");
assertThat(eventHandler.getEvents()).containsExactly(Event.warn("warning event"));
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
index b056c67..351c5ed 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java
@@ -269,7 +269,7 @@
.newPackageBuilder(
PackageIdentifier.createInMainRepo(TEST_PACKAGE_NAME),
"TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ StarlarkSemantics.DEFAULT)
.setFilename(RootedPath.toRootedPath(root, testBuildfilePath));
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java
index 066d0a1..f89a2df 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/RuleFactoryTest.java
@@ -61,9 +61,7 @@
Package.Builder pkgBuilder =
packageFactory
.newPackageBuilder(
- PackageIdentifier.createInMainRepo("mypkg"),
- "TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ PackageIdentifier.createInMainRepo("mypkg"), "TESTING", StarlarkSemantics.DEFAULT)
.setFilename(RootedPath.toRootedPath(root, myPkgPath));
Map<String, Object> attributeValues = new HashMap<>();
@@ -77,7 +75,7 @@
ruleClass,
new BuildLangTypedAttributeValuesMap(attributeValues),
new Reporter(new EventBus()),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
DUMMY_STACK,
new AttributeContainer(ruleClass));
@@ -122,9 +120,7 @@
Path myPkgPath = scratch.resolve("/workspace/WORKSPACE");
Package.Builder pkgBuilder =
packageFactory.newExternalPackageBuilder(
- RootedPath.toRootedPath(root, myPkgPath),
- "TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS);
+ RootedPath.toRootedPath(root, myPkgPath), "TESTING", StarlarkSemantics.DEFAULT);
Map<String, Object> attributeValues = new HashMap<>();
attributeValues.put("name", "foo");
@@ -137,7 +133,7 @@
ruleClass,
new BuildLangTypedAttributeValuesMap(attributeValues),
new Reporter(new EventBus()),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
DUMMY_STACK,
new AttributeContainer(ruleClass));
assertThat(rule.containsErrors()).isFalse();
@@ -149,9 +145,7 @@
Package.Builder pkgBuilder =
packageFactory
.newPackageBuilder(
- PackageIdentifier.createInMainRepo("mypkg"),
- "TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ PackageIdentifier.createInMainRepo("mypkg"), "TESTING", StarlarkSemantics.DEFAULT)
.setFilename(RootedPath.toRootedPath(root, myPkgPath));
Map<String, Object> attributeValues = new HashMap<>();
@@ -168,7 +162,7 @@
ruleClass,
new BuildLangTypedAttributeValuesMap(attributeValues),
new Reporter(new EventBus()),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
DUMMY_STACK,
new AttributeContainer(ruleClass)));
assertThat(e).hasMessageThat().contains("must be in the WORKSPACE file");
@@ -180,9 +174,7 @@
Package.Builder pkgBuilder =
packageFactory
.newPackageBuilder(
- LabelConstants.EXTERNAL_PACKAGE_IDENTIFIER,
- "TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ LabelConstants.EXTERNAL_PACKAGE_IDENTIFIER, "TESTING", StarlarkSemantics.DEFAULT)
.setFilename(RootedPath.toRootedPath(root, myPkgPath));
Map<String, Object> attributeValues = new HashMap<>();
@@ -199,7 +191,7 @@
ruleClass,
new BuildLangTypedAttributeValuesMap(attributeValues),
new Reporter(new EventBus()),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
DUMMY_STACK,
new AttributeContainer(ruleClass)));
assertThat(e).hasMessageThat().contains("cannot be in the WORKSPACE file");
@@ -224,9 +216,7 @@
Package.Builder pkgBuilder =
packageFactory
.newPackageBuilder(
- PackageIdentifier.createInMainRepo("mypkg"),
- "TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ PackageIdentifier.createInMainRepo("mypkg"), "TESTING", StarlarkSemantics.DEFAULT)
.setFilename(RootedPath.toRootedPath(root, myPkgPath));
Map<String, Object> attributeValues = new HashMap<>();
@@ -242,7 +232,7 @@
ruleClass,
new BuildLangTypedAttributeValuesMap(attributeValues),
new Reporter(new EventBus()),
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
DUMMY_STACK,
new AttributeContainer(ruleClass)));
assertWithMessage(e.getMessage())
@@ -261,9 +251,7 @@
Package pkg =
packageFactory
.newPackageBuilder(
- PackageIdentifier.createInMainRepo("mypkg"),
- "TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ PackageIdentifier.createInMainRepo("mypkg"), "TESTING", StarlarkSemantics.DEFAULT)
.setFilename(RootedPath.toRootedPath(root, myPkgPath))
.build();
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 1aeb408..74effcb 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
@@ -98,14 +98,14 @@
@Test
public void checkDefaultsMatch() {
StarlarkSemanticsOptions defaultOptions = Options.getDefaults(StarlarkSemanticsOptions.class);
- StarlarkSemantics defaultSemantics = StarlarkSemantics.DEFAULT_SEMANTICS;
+ StarlarkSemantics defaultSemantics = StarlarkSemantics.DEFAULT;
StarlarkSemantics semanticsFromOptions = defaultOptions.toSkylarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(defaultSemantics);
}
@Test
public void canGetBuilderFromInstance() {
- StarlarkSemantics original = StarlarkSemantics.DEFAULT_SEMANTICS;
+ StarlarkSemantics original = StarlarkSemantics.DEFAULT;
assertThat(original.internalSkylarkFlagTestCanary()).isFalse();
StarlarkSemantics modified = original.toBuilder().internalSkylarkFlagTestCanary(true).build();
assertThat(modified.internalSkylarkFlagTestCanary()).isTrue();
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 0fb38d4..2839948 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
@@ -51,7 +51,7 @@
this.exception = null;
this.events = null;
this.allowOverride = allowOverride;
- this.starlarkSemantics = StarlarkSemantics.DEFAULT_SEMANTICS;
+ this.starlarkSemantics = StarlarkSemantics.DEFAULT;
}
void parse(String... args) {
@@ -67,7 +67,7 @@
Package.Builder.DefaultHelper.INSTANCE,
RootedPath.toRootedPath(root, workspaceFilePath),
"",
- StarlarkSemantics.DEFAULT_SEMANTICS);
+ StarlarkSemantics.DEFAULT);
WorkspaceFactory factory =
new WorkspaceFactory(
builder,
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 445c890..9226164 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
@@ -174,7 +174,7 @@
filename.getRoot(),
filename.getRootRelativePath().getParentDirectory().getRelative("WORKSPACE")),
"TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS)
+ StarlarkSemantics.DEFAULT)
.build();
Package.Builder resultBuilder =
factory.evaluateBuildFile(
@@ -184,7 +184,7 @@
filename,
globber,
ConstantRuleVisibility.PUBLIC,
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
ImmutableMap.<String, Module>of(),
ImmutableList.<Label>of(),
/*repositoryMapping=*/ ImmutableMap.of());
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
index 55a936f..65d28f9 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageHelperTest.java
@@ -181,7 +181,7 @@
MemoizingEvaluator evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer);
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index e2ba662..7a7ebaf 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
@@ -88,7 +88,7 @@
@Override
public StarlarkSemantics getSkylarkSemantics() {
- return StarlarkSemantics.DEFAULT_SEMANTICS;
+ return StarlarkSemantics.DEFAULT;
}
@Override
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java
index 3725d73..33ea1a7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java
@@ -40,7 +40,7 @@
public class ObjcProviderTest {
private static ObjcProvider.StarlarkBuilder objcProviderBuilder() {
- return new ObjcProvider.StarlarkBuilder(StarlarkSemantics.DEFAULT_SEMANTICS);
+ return new ObjcProvider.StarlarkBuilder(StarlarkSemantics.DEFAULT);
}
private static ImmutableList<ObjcProvider.Key<?>> getAllKeys() throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
index f4732a9..500eaed 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -221,7 +221,7 @@
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
differencer, RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
PrecomputedValue.REPO_ENV.set(differencer, ImmutableMap.of());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index 64cd898..0ab1f82 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -168,7 +168,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(
differencer, ImmutableMap.<RepositoryName, PathFragment>of());
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
index 714a52c..6bb55df 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
@@ -200,7 +200,7 @@
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(differencer, ImmutableMap.of());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.absent());
return new SequentialBuildDriver(evaluator);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
index bebd3f5..641ff27 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
@@ -143,7 +143,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
}
private Artifact getSourceArtifact(String path) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index 9ce1d92..3ced1a8 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -135,7 +135,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
index dcf4a09..1c1c999 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -131,7 +131,7 @@
evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer);
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index e35b333..08c0f64 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -177,7 +177,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(
differencer, ImmutableMap.<RepositoryName, PathFragment>of());
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index 74fda80..9b63767 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -200,7 +200,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT);
}
private Artifact sourceArtifact(String path) {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java
index 0cd7307..f050b4c 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java
@@ -202,7 +202,7 @@
Package.Builder.DefaultHelper.INSTANCE,
RootedPath.toRootedPath(root, buildFile.getRelative("WORKSPACE")),
"TESTING",
- StarlarkSemantics.DEFAULT_SEMANTICS);
+ StarlarkSemantics.DEFAULT);
externalPkg.setWorkspaceName(workspaceName);
return pkgFactory.createPackageForTesting(
packageId,
@@ -210,6 +210,6 @@
RootedPath.toRootedPath(root, buildFile),
packageIdentifier -> buildFile,
reporter,
- StarlarkSemantics.DEFAULT_SEMANTICS);
+ StarlarkSemantics.DEFAULT);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
index 8ee19fd..aeca3c9 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
@@ -221,7 +221,7 @@
invocation -> {
SkyKey key = (SkyKey) invocation.getArguments()[0];
if (key.equals(PrecomputedValue.STARLARK_SEMANTICS.getKeyForTesting())) {
- return new PrecomputedValue(StarlarkSemantics.DEFAULT_SEMANTICS);
+ return new PrecomputedValue(StarlarkSemantics.DEFAULT);
} else if (key.equals(
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE
.getKeyForTesting())) {
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
index d8d0193..52680ca 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -49,7 +49,7 @@
private EventCollectionApparatus eventCollectionApparatus =
new EventCollectionApparatus(EventKind.ALL_EVENTS);
- private StarlarkSemantics semantics = StarlarkSemantics.DEFAULT_SEMANTICS;
+ private StarlarkSemantics semantics = StarlarkSemantics.DEFAULT;
private final Map<String, Object> extraPredeclared = new HashMap<>();
private StarlarkThread thread;
diff --git a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
index c480523..f4dc7c1 100644
--- a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
+++ b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
@@ -90,7 +90,7 @@
StarlarkEvaluationException.class,
() ->
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -122,7 +122,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ruleInfoMap,
ImmutableMap.builder(),
@@ -200,7 +200,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ruleInfoMap,
ImmutableMap.builder(),
@@ -245,7 +245,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMapBuilder = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ruleInfoMapBuilder,
ImmutableMap.builder(),
@@ -295,7 +295,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMapBuilder = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ruleInfoMapBuilder,
ImmutableMap.builder(),
@@ -325,7 +325,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMapBuilder = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ruleInfoMapBuilder,
ImmutableMap.builder(),
@@ -363,7 +363,7 @@
StarlarkEvaluationException.class,
() ->
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -397,7 +397,7 @@
ImmutableMap.Builder<String, StarlarkFunction> functionInfoBuilder = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -442,7 +442,7 @@
ImmutableMap.Builder<String, StarlarkFunction> funcInfoMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -482,7 +482,7 @@
ImmutableMap.Builder<String, ProviderInfo> providerInfoMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
providerInfoMap,
@@ -537,7 +537,7 @@
ImmutableMap.Builder<String, AspectInfo> aspectInfoMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -574,7 +574,7 @@
ImmutableMap.Builder<Label, String> moduleDocMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -605,7 +605,7 @@
ImmutableMap.Builder<Label, String> moduleDocMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -637,7 +637,7 @@
ImmutableMap.Builder<Label, String> moduleDocMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
@@ -668,7 +668,7 @@
ImmutableMap.Builder<Label, String> moduleDocMap = ImmutableMap.builder();
skydocMain.eval(
- StarlarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT,
Label.parseAbsoluteUnchecked("//test:othertest.bzl"),
ImmutableMap.builder(),
ImmutableMap.builder(),
