The great Skylark -> Starlark migration: package lib.analysis.skylark PiperOrigin-RevId: 317370077
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD index c486899..abd3dba 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD +++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -120,15 +120,15 @@ ":rule_definition_context", ":rule_definition_environment", ":server_directories", - ":skylark/args", - ":skylark/bazel_build_api_globals", - ":skylark/function_transition_util", - ":skylark/starlark_api_provider", - ":skylark/starlark_command_line", - ":skylark/starlark_config", - ":skylark/starlark_custom_command_line", - ":skylark/starlark_error_reporter", - ":skylark/starlark_late_bound_default", + ":starlark/args", + ":starlark/bazel_build_api_globals", + ":starlark/function_transition_util", + ":starlark/starlark_api_provider", + ":starlark/starlark_command_line", + ":starlark/starlark_config", + ":starlark/starlark_custom_command_line", + ":starlark/starlark_error_reporter", + ":starlark/starlark_late_bound_default", ":statically_linked_marker_provider", ":target_configured_event", ":template_variable_info", @@ -246,16 +246,16 @@ "extra/ExtraAction.java", "extra/ExtraActionMapProvider.java", "extra/ExtraActionSpec.java", - "skylark/StarlarkActionFactory.java", - "skylark/StarlarkAttrModule.java", - "skylark/StarlarkAttributeTransitionProvider.java", - "skylark/StarlarkAttributesCollection.java", - "skylark/StarlarkModules.java", - "skylark/StarlarkRuleClassFunctions.java", - "skylark/StarlarkRuleConfiguredTargetUtil.java", - "skylark/StarlarkRuleContext.java", - "skylark/StarlarkRuleTransitionProvider.java", - "skylark/StarlarkTransition.java", + "starlark/StarlarkActionFactory.java", + "starlark/StarlarkAttrModule.java", + "starlark/StarlarkAttributeTransitionProvider.java", + "starlark/StarlarkAttributesCollection.java", + "starlark/StarlarkModules.java", + "starlark/StarlarkRuleClassFunctions.java", + "starlark/StarlarkRuleConfiguredTargetUtil.java", + "starlark/StarlarkRuleContext.java", + "starlark/StarlarkRuleTransitionProvider.java", + "starlark/StarlarkTransition.java", "test/AnalysisTestActionBuilder.java", "test/BaselineCoverageAction.java", "test/CoverageCommon.java", @@ -339,12 +339,12 @@ ":resolved_toolchain_context", ":rule_definition_context", ":rule_definition_environment", - ":skylark/args", - ":skylark/bazel_build_api_globals", - ":skylark/function_transition_util", - ":skylark/starlark_api_provider", - ":skylark/starlark_command_line", - ":skylark/starlark_late_bound_default", + ":starlark/args", + ":starlark/bazel_build_api_globals", + ":starlark/function_transition_util", + ":starlark/starlark_api_provider", + ":starlark/starlark_command_line", + ":starlark/starlark_late_bound_default", ":template_variable_info", ":test/analysis_failure", ":test/analysis_failure_info", @@ -1982,12 +1982,12 @@ ], ) -# TODO(b/144899336): This should be analysis/skylark/BUILD +# TODO(b/144899336): This should be analysis/starlark/BUILD java_library( - name = "skylark/args", - srcs = ["skylark/Args.java"], + name = "starlark/args", + srcs = ["starlark/Args.java"], deps = [ - ":skylark/starlark_custom_command_line", + ":starlark/starlark_custom_command_line", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/concurrent", @@ -2000,10 +2000,10 @@ ) java_library( - name = "skylark/bazel_build_api_globals", - srcs = ["skylark/BazelBuildApiGlobals.java"], + name = "starlark/bazel_build_api_globals", + srcs = ["starlark/BazelBuildApiGlobals.java"], deps = [ - ":skylark/starlark_late_bound_default", + ":starlark/starlark_late_bound_default", "//src/main/java/com/google/devtools/build/lib/packages", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", @@ -2011,8 +2011,8 @@ ) java_library( - name = "skylark/function_transition_util", - srcs = ["skylark/FunctionTransitionUtil.java"], + name = "starlark/function_transition_util", + srcs = ["starlark/FunctionTransitionUtil.java"], deps = [ ":config/build_options", ":config/core_options", @@ -2030,8 +2030,8 @@ ) java_library( - name = "skylark/starlark_api_provider", - srcs = ["skylark/StarlarkApiProvider.java"], + name = "starlark/starlark_api_provider", + srcs = ["starlark/StarlarkApiProvider.java"], deps = [ ":provider_collection", "//third_party:guava", @@ -2039,8 +2039,8 @@ ) java_library( - name = "skylark/starlark_command_line", - srcs = ["skylark/StarlarkCommandLine.java"], + name = "starlark/starlark_command_line", + srcs = ["starlark/StarlarkCommandLine.java"], deps = [ "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", @@ -2050,8 +2050,8 @@ ) java_library( - name = "skylark/starlark_custom_command_line", - srcs = ["skylark/StarlarkCustomCommandLine.java"], + name = "starlark/starlark_custom_command_line", + srcs = ["starlark/StarlarkCustomCommandLine.java"], deps = [ "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/actions:commandline_item", @@ -2070,8 +2070,8 @@ ) java_library( - name = "skylark/starlark_error_reporter", - srcs = ["skylark/StarlarkErrorReporter.java"], + name = "starlark/starlark_error_reporter", + srcs = ["starlark/StarlarkErrorReporter.java"], deps = [ "//src/main/java/com/google/devtools/build/lib/packages", "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", @@ -2079,8 +2079,8 @@ ) java_library( - name = "skylark/starlark_late_bound_default", - srcs = ["skylark/StarlarkLateBoundDefault.java"], + name = "starlark/starlark_late_bound_default", + srcs = ["starlark/StarlarkLateBoundDefault.java"], deps = [ "//src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations", "//src/main/java/com/google/devtools/build/lib/cmdline", @@ -2095,8 +2095,8 @@ ) java_library( - name = "skylark/starlark_config", - srcs = ["skylark/StarlarkConfig.java"], + name = "starlark/starlark_config", + srcs = ["starlark/StarlarkConfig.java"], deps = [ ":config/execution_transition_factory", "//src/main/java/com/google/devtools/build/lib/packages",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java index e508767..4990310 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -27,7 +27,7 @@ import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.config.CoreOptions; import com.google.devtools.build.lib.analysis.config.CoreOptions.IncludeConfigFragmentsEnum; -import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkApiProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java index 86675b6..52ff3fc 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -40,7 +40,7 @@ import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory; import com.google.devtools.build.lib.analysis.constraints.ConstraintSemantics; import com.google.devtools.build.lib.analysis.constraints.RuleContextConstraintSemantics; -import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; +import com.google.devtools.build.lib.analysis.starlark.StarlarkModules; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.RepositoryName;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index f35e885..cddea57 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -36,7 +36,7 @@ import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.PackageGroupConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleConfiguredTargetUtil; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleConfiguredTargetUtil; import com.google.devtools.build.lib.analysis.test.AnalysisFailure; import com.google.devtools.build.lib.analysis.test.AnalysisFailureInfo; import com.google.devtools.build.lib.cmdline.Label;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java index f4fa960..57ee184 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
@@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleConfiguredTargetUtil; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleConfiguredTargetUtil; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java index 482d555..7a6a8f9 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -64,7 +64,7 @@ import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; -import com.google.devtools.build.lib.analysis.skylark.Args; +import com.google.devtools.build.lib.analysis.starlark.Args; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java index 81f311e..3e90ffa 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
@@ -34,8 +34,8 @@ import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition; import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory; import com.google.devtools.build.lib.analysis.config.transitions.TransitionUtil; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.TransitionException; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.ExtendedEventHandler;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/DependencyEvaluationException.java b/src/main/java/com/google/devtools/build/lib/analysis/config/DependencyEvaluationException.java index f62e531..01dfa88 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/DependencyEvaluationException.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/DependencyEvaluationException.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.analysis.config; import com.google.devtools.build.lib.analysis.InconsistentAspectOrderException; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.TransitionException; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException; import com.google.devtools.build.lib.skyframe.ConfiguredValueCreationException; /** Exception class that signals an error during the evaluation of a dependency. */
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java index 7281ede..cd00268 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
@@ -31,7 +31,7 @@ import com.google.devtools.build.lib.analysis.Util; import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider; import com.google.devtools.build.lib.analysis.config.RunUnder; -import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkApiProvider; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.BlazeInterners;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java similarity index 98% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java index b52fa9e..8edda82 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; @@ -23,7 +23,7 @@ import com.google.devtools.build.lib.actions.ParamFileInfo; import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.actions.SingleStringArgFormatter; -import com.google.devtools.build.lib.analysis.skylark.StarlarkCustomCommandLine.ScalarArg; +import com.google.devtools.build.lib.analysis.starlark.StarlarkCustomCommandLine.ScalarArg; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/BazelBuildApiGlobals.java similarity index 96% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/BazelBuildApiGlobals.java index 3ee534a..293f4da 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/BazelBuildApiGlobals.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkBuildApiGlobals;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java index 78e3052..f089496 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import static java.util.stream.Collectors.joining;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java index 8b62916..f0b4cf4 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import static java.util.stream.Collectors.toList;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkApiProvider.java similarity index 96% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkApiProvider.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkApiProvider.java index bc6f65f..d30afa8 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkApiProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkApiProvider.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.analysis.ProviderCollection;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java index f91156b..ac859d3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributeTransitionProvider.java similarity index 94% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributeTransitionProvider.java index 03ceb85..78a6fd2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributeTransitionProvider.java
@@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; -import static com.google.devtools.build.lib.analysis.skylark.FunctionTransitionUtil.applyAndValidate; -import static com.google.devtools.build.lib.analysis.skylark.StarlarkAttributesCollection.ERROR_MESSAGE_FOR_NO_ATTR; +import static com.google.devtools.build.lib.analysis.starlark.FunctionTransitionUtil.applyAndValidate; +import static com.google.devtools.build.lib.analysis.starlark.StarlarkAttributesCollection.ERROR_MESSAGE_FOR_NO_ATTR; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java index d487978..5029622a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCommandLine.java similarity index 96% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCommandLine.java index a3b6ee9..a85032c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCommandLine.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.nestedset.Depset;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java similarity index 97% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java index 5b197c6..0b8ae20 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkConfig.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import static com.google.devtools.build.lib.packages.Type.BOOLEAN; import static com.google.devtools.build.lib.packages.Type.INTEGER;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCustomCommandLine.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCustomCommandLine.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCustomCommandLine.java index 881369d..08edb6a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCustomCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkCustomCommandLine.java
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkErrorReporter.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkErrorReporter.java similarity index 97% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkErrorReporter.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkErrorReporter.java index b3ab3a7..4bbf763 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkErrorReporter.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkErrorReporter.java
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.packages.RuleErrorConsumer;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java index 4e94932..ef874bb 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.base.Preconditions; import com.google.common.cache.CacheBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkModules.java similarity index 97% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkModules.java index 05ab97f..e8ceafb 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkModules.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.ActionsProvider;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleClassFunctions.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java index 763b83c..4409eba 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import static com.google.devtools.build.lib.analysis.BaseRuleClasses.RUN_UNDER; import static com.google.devtools.build.lib.analysis.BaseRuleClasses.getTestRuntimeLabelList; @@ -40,7 +40,7 @@ import com.google.devtools.build.lib.analysis.config.ConfigAwareRuleClassBuilder; import com.google.devtools.build.lib.analysis.config.HostTransition; import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkAttrModule.Descriptor; +import com.google.devtools.build.lib.analysis.starlark.StarlarkAttrModule.Descriptor; import com.google.devtools.build.lib.analysis.test.TestConfiguration; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleConfiguredTargetUtil.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleConfiguredTargetUtil.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleConfiguredTargetUtil.java index dd6b43c..fda7182 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleConfiguredTargetUtil.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleConfiguredTargetUtil.java
@@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleContext.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java index 5910713..1e8de4e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; import static com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition.PATCH_TRANSITION_KEY; import static com.google.devtools.build.lib.packages.RuleClass.Builder.STARLARK_BUILD_SETTING_DEFAULT_ATTR_NAME;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProvider.java similarity index 97% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleTransitionProvider.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProvider.java index 2de919b..34d2a26 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleTransitionProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProvider.java
@@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; -import static com.google.devtools.build.lib.analysis.skylark.FunctionTransitionUtil.applyAndValidate; +import static com.google.devtools.build.lib.analysis.starlark.FunctionTransitionUtil.applyAndValidate; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Iterables;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkTransition.java rename to src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java index 45a47ad..2456136 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkTransition.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java
@@ -11,9 +11,9 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.analysis.skylark; +package com.google.devtools.build.lib.analysis.starlark; -import static com.google.devtools.build.lib.analysis.skylark.FunctionTransitionUtil.COMMAND_LINE_OPTION_PREFIX; +import static com.google.devtools.build.lib.analysis.starlark.FunctionTransitionUtil.COMMAND_LINE_OPTION_PREFIX; import static com.google.devtools.build.lib.packages.RuleClass.Builder.STARLARK_BUILD_SETTING_DEFAULT_ATTR_NAME; import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java b/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java index 7dc9c84..4fff467 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector.InstrumentationSpec; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order;
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java index 6d4b318..db39209 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java
@@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.BaseRuleClasses; -import com.google.devtools.build.lib.analysis.skylark.StarlarkAttrModule.Descriptor; +import com.google.devtools.build.lib.analysis.starlark.StarlarkAttrModule.Descriptor; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.packages.AttributeValueSource;
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java index 0a1e65a..19b6eaf 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
@@ -17,8 +17,8 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.rules.cpp.CcCompilationContext; import com.google.devtools.build.lib.rules.cpp.CcCompilationOutputs; import com.google.devtools.build.lib.rules.cpp.CcLinkingContext;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java index 0b5b561..5be3f28 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkApiProvider; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java index 3299b1a..7883639 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkData.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; -import com.google.devtools.build.lib.analysis.skylark.StarlarkErrorReporter; +import com.google.devtools.build.lib.analysis.starlark.StarlarkErrorReporter; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/BUILD b/src/main/java/com/google/devtools/build/lib/rules/android/BUILD index 32c9d85..5d46f6d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/android/BUILD
@@ -57,8 +57,8 @@ "//src/main/java/com/google/devtools/build/lib/analysis:file_provider", "//src/main/java/com/google/devtools/build/lib/analysis:platform_options", "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/starlark_api_provider", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/starlark_error_reporter", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_api_provider", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_error_reporter", "//src/main/java/com/google/devtools/build/lib/analysis:test/execution_info", "//src/main/java/com/google/devtools/build/lib/analysis:transition_mode", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_collection",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/BUILD b/src/main/java/com/google/devtools/build/lib/rules/config/BUILD index 10ad1b9..476b564 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/config/BUILD
@@ -37,8 +37,8 @@ "//src/main/java/com/google/devtools/build/lib/analysis:configured_target", "//src/main/java/com/google/devtools/build/lib/analysis:file_provider", "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/function_transition_util", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/starlark_config", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/function_transition_util", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_config", "//src/main/java/com/google/devtools/build/lib/analysis:transition_mode", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_collection", "//src/main/java/com/google/devtools/build/lib/analysis/platform",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigGlobalLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigGlobalLibrary.java index 30b9926..84ab0f6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigGlobalLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigGlobalLibrary.java
@@ -14,11 +14,11 @@ package com.google.devtools.build.lib.rules.config; -import static com.google.devtools.build.lib.analysis.skylark.FunctionTransitionUtil.COMMAND_LINE_OPTION_PREFIX; +import static com.google.devtools.build.lib.analysis.starlark.FunctionTransitionUtil.COMMAND_LINE_OPTION_PREFIX; import com.google.common.collect.Sets; import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.Settings; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.Settings; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skylarkbuildapi.config.ConfigGlobalLibraryApi; import com.google.devtools.build.lib.skylarkbuildapi.config.ConfigurationTransitionApi;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java index 6a47a1d..21da26d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.analysis.BaseRuleClasses; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet; -import com.google.devtools.build.lib.analysis.skylark.StarlarkConfig; +import com.google.devtools.build.lib.analysis.starlark.StarlarkConfig; import com.google.devtools.build.lib.rules.config.ConfigFeatureFlagTaggedTrimmingTransitionFactory.ConfigFeatureFlagTaggedTrimmingTransition; import com.google.devtools.build.lib.rules.core.CoreRules; import com.google.devtools.build.lib.rules.platform.PlatformRules;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD index 2893782..f52f810 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD
@@ -65,8 +65,8 @@ "//src/main/java/com/google/devtools/build/lib/analysis:middleman_provider", "//src/main/java/com/google/devtools/build/lib/analysis:package_specification_provider", "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/args", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/starlark_api_provider", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/args", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_api_provider", "//src/main/java/com/google/devtools/build/lib/analysis:statically_linked_marker_provider", "//src/main/java/com/google/devtools/build/lib/analysis:template_variable_info", "//src/main/java/com/google/devtools/build/lib/analysis:test/analysis_failure",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index e82a17e..ece4ac9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -34,7 +34,7 @@ import com.google.devtools.build.lib.analysis.actions.FileWriteAction; import com.google.devtools.build.lib.analysis.config.CompilationMode; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.stringtemplate.ExpansionException; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector.LocalMetadataCollector;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index 551e9ba..e001d27 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -28,8 +28,8 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.collect.nestedset.Depset;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java index d4df5a5..85c9991 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkApiProvider.java
@@ -18,7 +18,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; -import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkApiProvider; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 7ba1879..b95e8c1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -55,7 +55,7 @@ import com.google.devtools.build.lib.actions.extra.CppCompileInfo; import com.google.devtools.build.lib.actions.extra.EnvironmentVariable; import com.google.devtools.build.lib.actions.extra.ExtraActionInfo; -import com.google.devtools.build.lib.analysis.skylark.Args; +import com.google.devtools.build.lib.analysis.starlark.Args; import com.google.devtools.build.lib.bugreport.BugReport; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelConstants;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java index f788cab..4980dac 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
@@ -48,7 +48,7 @@ import com.google.devtools.build.lib.actions.extra.ExtraActionInfo; import com.google.devtools.build.lib.analysis.actions.ActionConstructionContext; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; -import com.google.devtools.build.lib.analysis.skylark.Args; +import com.google.devtools.build.lib.analysis.starlark.Args; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.collect.CollectionUtils;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD index 994d54f..11fd040 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD
@@ -194,7 +194,7 @@ "//src/main/java/com/google/devtools/build/lib/analysis:platform_options", "//src/main/java/com/google/devtools/build/lib/analysis:provider_collection", "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/starlark_api_provider", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/starlark_api_provider", "//src/main/java/com/google/devtools/build/lib/analysis:test/instrumented_files_info", "//src/main/java/com/google/devtools/build/lib/analysis:test/test_configuration", "//src/main/java/com/google/devtools/build/lib/analysis:transition_mode",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java index 8b5d8dd..444ee49 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java
@@ -31,8 +31,8 @@ import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.StrictDepsMode; -import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java index b90f641..60abf74 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiProvider.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.rules.java; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.skylark.StarlarkApiProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkApiProvider; import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaStarlarkApiProviderApi;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java index 3227f24..dc3b78d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -18,8 +18,8 @@ import com.google.devtools.build.lib.analysis.PlatformOptions; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.packages.Provider;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoStarlarkCommon.java index fb4e927..e53c595 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoStarlarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoStarlarkCommon.java
@@ -21,7 +21,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java index ec5fe74..cc30e53 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java
@@ -22,7 +22,7 @@ import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.packages.NativeProvider;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java index 1cac710..ac310f4 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -54,7 +54,7 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.config.transitions.PatchTransition; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.TransitionException; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException; import com.google.devtools.build.lib.causes.AnalysisFailedCause; import com.google.devtools.build.lib.causes.Cause; import com.google.devtools.build.lib.causes.LoadingFailedCause;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareAnalysisPhaseFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareAnalysisPhaseFunction.java index ebab3da..6b76769 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareAnalysisPhaseFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareAnalysisPhaseFunction.java
@@ -34,8 +34,8 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition; import com.google.devtools.build.lib.analysis.config.transitions.NullTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.TransitionException; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.ResolvedTargets; import com.google.devtools.build.lib.events.ErrorSensingEventHandler;
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 e01f2b4..01e7153 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
@@ -93,8 +93,8 @@ import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; import com.google.devtools.build.lib.analysis.config.transitions.NullTransition; import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.TransitionException; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException; import com.google.devtools.build.lib.buildtool.BuildRequestOptions; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java index acbdb27..82a43cd 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
@@ -21,8 +21,8 @@ import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.StarlarkProviderValidationUtil; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleConfiguredTargetUtil; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleConfiguredTargetUtil; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.packages.AspectDescriptor; import com.google.devtools.build.lib.packages.AspectParameters;
diff --git a/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java b/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java index 3d652a2..ca087d1 100644 --- a/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java +++ b/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java
@@ -21,8 +21,8 @@ import com.google.devtools.build.docgen.starlark.StarlarkBuiltinDoc; import com.google.devtools.build.docgen.starlark.StarlarkConstructorMethodDoc; import com.google.devtools.build.docgen.starlark.StarlarkMethodDoc; -import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkModules; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.Sequence;
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 b0520c6..46ee6d3 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
@@ -45,7 +45,7 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; import com.google.devtools.build.lib.analysis.configuredtargets.InputFileConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition; import com.google.devtools.build.lib.buildtool.BuildRequestOptions; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.cmdline.Label;
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java index bce8237..1b3d571 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
@@ -56,7 +56,7 @@ import com.google.devtools.build.lib.analysis.config.TransitionResolver; import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition; import com.google.devtools.build.lib.analysis.test.CoverageReportActionFactory; import com.google.devtools.build.lib.causes.Cause; import com.google.devtools.build.lib.cmdline.Label;
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 68d1dc1..9e20694 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
@@ -95,7 +95,7 @@ import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.extra.ExtraAction; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition; import com.google.devtools.build.lib.analysis.test.BaselineCoverageAction; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesInfo; import com.google.devtools.build.lib.buildtool.BuildRequestOptions;
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java b/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java index b23ec04..0488dc9 100644 --- a/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java
@@ -45,7 +45,7 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfigurationCollection; import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException; -import com.google.devtools.build.lib.analysis.skylark.StarlarkTransition.TransitionException; +import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.analysis.util.AnalysisTestUtil; import com.google.devtools.build.lib.analysis.util.AnalysisTestUtil.DummyWorkspaceStatusActionContext;
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java index ca7088e..951b5b6 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java
@@ -21,7 +21,7 @@ import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper; import com.google.devtools.build.lib.packages.Type;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/skylark/BUILD index 531ed07..7d65fb6 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skylark/BUILD
@@ -38,7 +38,7 @@ "//src/main/java/com/google/devtools/build/lib/analysis:configured_target", "//src/main/java/com/google/devtools/build/lib/analysis:file_provider", "//src/main/java/com/google/devtools/build/lib/analysis:resolved_toolchain_context", - "//src/main/java/com/google/devtools/build/lib/analysis:skylark/args", + "//src/main/java/com/google/devtools/build/lib/analysis:starlark/args", "//src/main/java/com/google/devtools/build/lib/analysis:test/analysis_failure", "//src/main/java/com/google/devtools/build/lib/analysis:test/analysis_failure_info", "//src/main/java/com/google/devtools/build/lib/analysis:test/analysis_test_result_info",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java index 3884490..e2bf8e6 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkIntegrationTest.java
@@ -33,8 +33,8 @@ import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition; import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkAttributeTransitionProvider; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleTransitionProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkAttributeTransitionProvider; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleTransitionProvider; import com.google.devtools.build.lib.analysis.test.AnalysisFailure; import com.google.devtools.build.lib.analysis.test.AnalysisFailureInfo; import com.google.devtools.build.lib.analysis.test.AnalysisTestResultInfo;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java index 4e871d5..7d2de2d 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
@@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; -import com.google.devtools.build.lib.analysis.skylark.StarlarkAttrModule; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleClassFunctions.StarlarkRuleFunction; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkAttrModule; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleClassFunctions.StarlarkRuleFunction; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java index 857f57d..c9385d2 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
@@ -38,7 +38,7 @@ import com.google.devtools.build.lib.analysis.actions.FileWriteAction; import com.google.devtools.build.lib.analysis.actions.StarlarkAction; import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.analysis.util.MockRule; import com.google.devtools.build.lib.cmdline.Label;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java index 656d03d..2ffe577 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java
@@ -45,8 +45,8 @@ import com.google.devtools.build.lib.analysis.actions.Substitution; import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.Args; -import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; +import com.google.devtools.build.lib.analysis.starlark.Args; +import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java index 212ff8d..124ee7d 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/util/BazelEvaluationTestCase.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; +import com.google.devtools.build.lib.analysis.starlark.StarlarkModules; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkContext;
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 b1c56bd..432a350 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
@@ -17,7 +17,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; // a bad dependency +import com.google.devtools.build.lib.analysis.starlark.StarlarkModules; // a bad dependency import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventCollector; import com.google.devtools.build.lib.events.EventKind;