Rename SKYLARK_SEMANTICS to STARLARK_SEMANTICS
RELNOTES: None.
PiperOrigin-RevId: 234497208
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
index 266122a..66d103d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
@@ -306,7 +306,7 @@
@Override
public StarlarkSemantics getSkylarkSemantics() throws InterruptedException {
- return PrecomputedValue.SKYLARK_SEMANTICS.get(skyframeEnv);
+ return PrecomputedValue.STARLARK_SEMANTICS.get(skyframeEnv);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java
index 265cfa3..19eb87c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java
@@ -108,7 +108,7 @@
throws RepositoryFunctionException, InterruptedException {
// Deprecation in favor of the Starlark rule
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
index c4b5dc5..62e8703 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
@@ -74,7 +74,7 @@
if (declareEnvironmentDependencies(markerData, env, getEnviron(rule)) == null) {
return null;
}
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
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 3a6b50d..f8fa525 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
@@ -65,7 +65,7 @@
@Option(
name = "check_third_party_targets_have_licenses",
defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
help = "If true, all rules and files under //third_party must declare licenses([])")
public boolean checkThirdPartyTargetsHaveLicenses;
@@ -95,7 +95,7 @@
@Option(
name = "experimental_enable_android_migration_apis",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
help = "If set to true, enables the APIs required to support the Android Starlark migration.")
public boolean experimentalEnableAndroidMigrationApis;
@@ -128,11 +128,12 @@
@Option(
name = "experimental_platforms_api",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {OptionMetadataTag.EXPERIMENTAL},
- help = "If set to true, enables a number of platform-related Starlark APIs useful for "
- + "debugging.")
+ help =
+ "If set to true, enables a number of platform-related Starlark APIs useful for "
+ + "debugging.")
public boolean experimentalPlatformsApi;
// TODO(cparsons): Resolve and finalize the transition() API. The transition implementation
@@ -140,7 +141,7 @@
@Option(
name = "experimental_starlark_config_transitions",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {OptionMetadataTag.EXPERIMENTAL},
help =
@@ -161,55 +162,52 @@
public String experimentalTransitionWhitelistLocation;
@Option(
- name = "incompatible_bzl_disallow_load_after_statement",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
- effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help =
- "If set to true, all `load` must be called at the top of .bzl files, before any other "
- + "statement."
- )
+ name = "incompatible_bzl_disallow_load_after_statement",
+ defaultValue = "false",
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
+ effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
+ metadataTags = {
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ },
+ help =
+ "If set to true, all `load` must be called at the top of .bzl files, before any other "
+ + "statement.")
public boolean incompatibleBzlDisallowLoadAfterStatement;
@Option(
- name = "incompatible_depset_union",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ name = "incompatible_depset_union",
+ defaultValue = "false",
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help =
- "If set to true, depset union using `+`, `|` or `.union` are forbidden. "
- + "Use the `depset` constructor instead."
- )
+ metadataTags = {
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ },
+ help =
+ "If set to true, depset union using `+`, `|` or `.union` are forbidden. "
+ + "Use the `depset` constructor instead.")
public boolean incompatibleDepsetUnion;
@Option(
- name = "incompatible_depset_is_not_iterable",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ name = "incompatible_depset_is_not_iterable",
+ defaultValue = "false",
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help =
- "If set to true, depset type is not iterable. For loops and functions expecting an "
- + "iterable will reject depset objects. Use the `.to_list` method to explicitly "
- + "convert to a list."
- )
+ metadataTags = {
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ },
+ help =
+ "If set to true, depset type is not iterable. For loops and functions expecting an "
+ + "iterable will reject depset objects. Use the `.to_list` method to explicitly "
+ + "convert to a list.")
public boolean incompatibleDepsetIsNotIterable;
@Option(
name = "incompatible_disable_deprecated_attr_params",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -235,22 +233,21 @@
public boolean requireFeatureConfigurationForPic;
@Option(
- name = "incompatible_disable_objc_provider_resources",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ name = "incompatible_disable_objc_provider_resources",
+ defaultValue = "false",
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
- metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
- },
- help = "If set to true, disallow use of deprecated resource fields on the Objc provider."
- )
+ metadataTags = {
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ },
+ help = "If set to true, disallow use of deprecated resource fields on the Objc provider.")
public boolean incompatibleDisableObjcProviderResources;
@Option(
name = "incompatible_disallow_data_transition",
defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -262,20 +259,19 @@
@Option(
name = "incompatible_disallow_dict_plus",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
- help = "If set to true, the `+` becomes disabled for dicts."
- )
+ help = "If set to true, the `+` becomes disabled for dicts.")
public boolean incompatibleDisallowDictPlus;
@Option(
name = "incompatible_disallow_filetype",
defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -287,7 +283,7 @@
@Option(
name = "incompatible_disallow_legacy_java_provider",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -299,33 +295,31 @@
@Option(
name = "incompatible_disallow_legacy_javainfo",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
- help = "If set to true, old-style JavaInfo provider construction is disallowed."
- )
+ help = "If set to true, old-style JavaInfo provider construction is disallowed.")
public boolean incompatibleDisallowLegacyJavaInfo;
@Option(
name = "incompatible_disallow_load_labels_to_cross_package_boundaries",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
- help = "If set to true, the label argument to 'load' cannot cross a package boundary."
- )
+ help = "If set to true, the label argument to 'load' cannot cross a package boundary.")
public boolean incompatibleDisallowLoadLabelsToCrossPackageBoundaries;
@Option(
name = "incompatible_disallow_struct_provider_syntax",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -339,7 +333,7 @@
@Option(
name = "incompatible_generate_javacommon_source_jar",
defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -353,14 +347,13 @@
name = "incompatible_disallow_old_style_args_add",
defaultValue = "false",
category = "incompatible changes",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
- help = "If set to true, vectorized calls to Args#add are disallowed."
- )
+ help = "If set to true, vectorized calls to Args#add are disallowed.")
public boolean incompatibleDisallowOldStyleArgsAdd;
@Option(
@@ -381,7 +374,7 @@
@Option(
name = "incompatible_new_actions_api",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -389,14 +382,13 @@
},
help =
"If set to true, the API to create actions is only available on `ctx.actions`, "
- + "not on `ctx`."
- )
+ + "not on `ctx`.")
public boolean incompatibleNewActionsApi;
@Option(
name = "incompatible_no_attr_license",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -408,20 +400,21 @@
@Option(
name = "incompatible_no_output_attr_default",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
- help = "If set to true, disables the `default` parameter of the `attr.output` and "
- + "`attr.output_list` attribute definition functions.")
+ help =
+ "If set to true, disables the `default` parameter of the `attr.output` and "
+ + "`attr.output_list` attribute definition functions.")
public boolean incompatibleNoOutputAttrDefault;
@Option(
name = "incompatible_no_support_tools_in_action_inputs",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -437,11 +430,11 @@
@Option(
name = "incompatible_no_target_output_group",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
- OptionMetadataTag.INCOMPATIBLE_CHANGE,
- OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+ OptionMetadataTag.INCOMPATIBLE_CHANGE,
+ OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
help = "If set to true, disables the output_group field of the 'Target' Starlark type.")
public boolean incompatibleNoTargetOutputGroup;
@@ -449,7 +442,7 @@
@Option(
name = "incompatible_no_transitive_loads",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -463,7 +456,7 @@
@Option(
name = "incompatible_remap_main_repo",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = OptionEffectTag.LOADING_AND_ANALYSIS,
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -476,7 +469,7 @@
@Option(
name = "incompatible_remove_native_maven_jar",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -490,7 +483,7 @@
@Option(
name = "incompatible_strict_argument_ordering",
defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -504,7 +497,7 @@
@Option(
name = "incompatible_string_is_not_iterable",
defaultValue = "true",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -527,7 +520,7 @@
@Option(
name = "incompatible_use_toolchain_providers_in_java_common",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java
index e46942b..6b83766 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java
@@ -72,7 +72,7 @@
@Option(
name = "incompatible_remove_old_python_version_api",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -88,7 +88,7 @@
@Option(
name = "incompatible_allow_python_version_transitions",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
@@ -198,7 +198,7 @@
@Option(
name = "incompatible_disallow_legacy_py_provider",
defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/ResolvedFileFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/ResolvedFileFunction.java
index 79f2f57..966de1f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/ResolvedFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/ResolvedFileFunction.java
@@ -46,7 +46,7 @@
throws InterruptedException, SkyFunctionException {
ResolvedFileKey key = (ResolvedFileKey) skyKey;
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
index 30ab3ab..43748b4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
@@ -103,7 +103,7 @@
if (!fileValue.isFile()) {
return ASTFileLookupValue.forBadFile(fileLabel);
}
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index f4dbbbe..bd473e8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -287,7 +287,7 @@
*/
private SkyValue getExternalPackage(Environment env, Root packageLookupPath)
throws PackageFunctionException, InterruptedException {
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
@@ -402,7 +402,7 @@
return null;
}
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
index 5d272bc..ff66ebe 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java
@@ -83,7 +83,7 @@
public static final Precomputed<RuleVisibility> DEFAULT_VISIBILITY =
new Precomputed<>(Key.create("default_visibility"));
- public static final Precomputed<StarlarkSemantics> SKYLARK_SEMANTICS =
+ public static final Precomputed<StarlarkSemantics> STARLARK_SEMANTICS =
new Precomputed<>(Key.create("skylark_semantics"));
static final Precomputed<UUID> BUILD_ID =
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 47c9c20..f09148c 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
@@ -1042,7 +1042,7 @@
}
protected void setSkylarkSemantics(StarlarkSemantics starlarkSemantics) {
- PrecomputedValue.SKYLARK_SEMANTICS.set(injectable(), starlarkSemantics);
+ PrecomputedValue.STARLARK_SEMANTICS.set(injectable(), starlarkSemantics);
}
public void injectExtraPrecomputedValues(
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
index cb0d829..0c3c081 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
@@ -225,7 +225,7 @@
throws InconsistentFilesystemException, SkylarkImportFailedException, InterruptedException {
PathFragment filePath = fileLabel.toPathFragment();
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
index 0874f6c..5672730 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
@@ -73,7 +73,7 @@
if (workspaceASTValue == null) {
return null;
}
- StarlarkSemantics starlarkSemantics = PrecomputedValue.SKYLARK_SEMANTICS.get(env);
+ StarlarkSemantics starlarkSemantics = PrecomputedValue.STARLARK_SEMANTICS.get(env);
if (starlarkSemantics == null) {
return null;
}
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 d08f9f0..916383a 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
@@ -288,7 +288,7 @@
}
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(injectable, pkgLocator);
PrecomputedValue.DEFAULT_VISIBILITY.set(injectable, ConstantRuleVisibility.PRIVATE);
- PrecomputedValue.SKYLARK_SEMANTICS.set(injectable, starlarkSemantics);
+ PrecomputedValue.STARLARK_SEMANTICS.set(injectable, starlarkSemantics);
return new ImmutableDiff(ImmutableList.of(), valuesToInject);
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java b/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java
index 3dc4a79..6cff955 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java
@@ -83,7 +83,7 @@
private static final String LOCATION = "com.google.devtools.build.lib.events.Location";
private static final String AST = "com.google.devtools.build.lib.syntax.FuncallExpression";
private static final String ENVIRONMENT = "com.google.devtools.build.lib.syntax.Environment";
- private static final String SKYLARK_SEMANTICS =
+ private static final String STARLARK_SEMANTICS =
"com.google.devtools.build.lib.syntax.StarlarkSemantics";
private static final String STARLARK_CONTEXT =
"com.google.devtools.build.lib.skylarkinterface.StarlarkContext";
@@ -440,14 +440,14 @@
currentIndex++;
}
if (annotation.useSkylarkSemantics()) {
- if (!SKYLARK_SEMANTICS.equals(methodSignatureParams.get(currentIndex).asType().toString())) {
+ if (!STARLARK_SEMANTICS.equals(methodSignatureParams.get(currentIndex).asType().toString())) {
throw new SkylarkCallableProcessorException(
methodElement,
String.format(
"Expected parameter index %d to be the %s type, matching useSkylarkSemantics, "
+ "but was %s",
currentIndex,
- SKYLARK_SEMANTICS,
+ STARLARK_SEMANTICS,
methodSignatureParams.get(currentIndex).asType().toString()));
}
currentIndex++;
diff --git a/src/main/java/com/google/devtools/common/options/OptionDocumentationCategory.java b/src/main/java/com/google/devtools/common/options/OptionDocumentationCategory.java
index 3c1b14a..0a56b33 100644
--- a/src/main/java/com/google/devtools/common/options/OptionDocumentationCategory.java
+++ b/src/main/java/com/google/devtools/common/options/OptionDocumentationCategory.java
@@ -88,7 +88,7 @@
* This option affects semantics of the skylark language or the build API accessible to BUILD
* files, .bzl files, or WORKSPACE files.
*/
- SKYLARK_SEMANTICS,
+ STARLARK_SEMANTICS,
/**
* This option dictates information about the test environment or test runner.
diff --git a/src/main/java/com/google/devtools/common/options/OptionFilterDescriptions.java b/src/main/java/com/google/devtools/common/options/OptionFilterDescriptions.java
index 4ed5dd7..496d10a 100644
--- a/src/main/java/com/google/devtools/common/options/OptionFilterDescriptions.java
+++ b/src/main/java/com/google/devtools/common/options/OptionFilterDescriptions.java
@@ -22,20 +22,20 @@
/** The order that the categories should be listed in. */
static OptionDocumentationCategory[] documentationOrder = {
- OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
- OptionDocumentationCategory.EXECUTION_STRATEGY,
- OptionDocumentationCategory.TOOLCHAIN,
- OptionDocumentationCategory.OUTPUT_SELECTION,
- OptionDocumentationCategory.OUTPUT_PARAMETERS,
- OptionDocumentationCategory.INPUT_STRICTNESS,
- OptionDocumentationCategory.SIGNING,
- OptionDocumentationCategory.SKYLARK_SEMANTICS,
- OptionDocumentationCategory.TESTING,
- OptionDocumentationCategory.QUERY,
- OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
- OptionDocumentationCategory.LOGGING,
- OptionDocumentationCategory.GENERIC_INPUTS,
- OptionDocumentationCategory.UNCATEGORIZED
+ OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
+ OptionDocumentationCategory.EXECUTION_STRATEGY,
+ OptionDocumentationCategory.TOOLCHAIN,
+ OptionDocumentationCategory.OUTPUT_SELECTION,
+ OptionDocumentationCategory.OUTPUT_PARAMETERS,
+ OptionDocumentationCategory.INPUT_STRICTNESS,
+ OptionDocumentationCategory.SIGNING,
+ OptionDocumentationCategory.STARLARK_SEMANTICS,
+ OptionDocumentationCategory.TESTING,
+ OptionDocumentationCategory.QUERY,
+ OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
+ OptionDocumentationCategory.LOGGING,
+ OptionDocumentationCategory.GENERIC_INPUTS,
+ OptionDocumentationCategory.UNCATEGORIZED
};
static ImmutableMap<OptionDocumentationCategory, String> getOptionCategoriesEnumDescription(
@@ -74,7 +74,7 @@
OptionDocumentationCategory.SIGNING,
"Options that affect the signing outputs of a build")
.put(
- OptionDocumentationCategory.SKYLARK_SEMANTICS,
+ OptionDocumentationCategory.STARLARK_SEMANTICS,
"This option affects semantics of the Starlark language or the build API accessible to "
+ "BUILD files, .bzl files, or WORKSPACE files.")
.put(
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
index 8c4c89d..568fd31 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
@@ -156,7 +156,7 @@
MemoizingEvaluator evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer);
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
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 fd6d902..330cc1b 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
@@ -145,7 +145,7 @@
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
differencer, RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
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 3a1e5ab..18bb0fb 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
@@ -157,7 +157,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
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 a32532f..c0be09d 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
@@ -192,7 +192,7 @@
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(
differencer, ImmutableMap.<RepositoryName, PathFragment>of());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
return new SequentialBuildDriver(evaluator);
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 037153b..e599f25 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
@@ -137,7 +137,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
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 7d17bbc..e49f757 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
@@ -129,7 +129,7 @@
evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer);
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
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 2dffe43..2e56120 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
@@ -170,7 +170,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.STARLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
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/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
index c1c3c43..fd134f1 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
@@ -187,7 +187,7 @@
@Override
public SkyValue answer(InvocationOnMock invocation) throws Throwable {
SkyKey key = (SkyKey) invocation.getArguments()[0];
- if (key.equals(PrecomputedValue.SKYLARK_SEMANTICS.getKeyForTesting())) {
+ if (key.equals(PrecomputedValue.STARLARK_SEMANTICS.getKeyForTesting())) {
return new PrecomputedValue(StarlarkSemantics.DEFAULT_SEMANTICS);
} else if (key.equals(
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE
