From 4858cbfa37d5ed96fb282280819a3577064eb51d Mon Sep 17 00:00:00 2001 From: wyv Date: Wed, 4 May 2022 13:56:45 -0700 Subject: [PATCH] Move BazelModuleContext to lib.cmdline This gets rid of an awkward "hook" in Label just to get the repo mapping of the current .bzl file. PiperOrigin-RevId: 446544458 --- .../google/devtools/build/lib/analysis/BUILD | 1 - .../config/BuildConfigurationValue.java | 2 +- .../PackageGroupConfiguredTarget.java | 2 +- .../analysis/starlark/StarlarkAttrModule.java | 2 +- .../starlark/StarlarkRuleClassFunctions.java | 2 +- .../build/lib/bazel/repository/starlark/BUILD | 1 - .../starlark/StarlarkRepositoryModule.java | 2 +- .../google/devtools/build/lib/cmdline/BUILD | 2 +- .../BazelModuleContext.java | 4 +--- .../devtools/build/lib/cmdline/Label.java | 21 ++++++------------- .../lib/packages/BazelStarlarkContext.java | 19 +---------------- .../lib/packages/BuiltinRestriction.java | 1 + .../build/lib/packages/LabelConverter.java | 1 + .../build/lib/packages/PackageFactory.java | 1 + .../lib/packages/StarlarkCallbackHelper.java | 2 +- .../build/lib/packages/WorkspaceGlobals.java | 1 + .../lib/rules/apple/AppleConfiguration.java | 2 +- .../lib/rules/config/ConfigGlobalLibrary.java | 2 +- .../build/lib/rules/cpp/CcModule.java | 2 +- .../build/lib/rules/cpp/CppConfiguration.java | 2 +- .../devtools/build/lib/rules/java/BUILD | 1 - .../lib/rules/java/JavaStarlarkCommon.java | 2 +- .../build/lib/rules/proto/ProtoCommon.java | 2 +- .../google/devtools/build/lib/skyframe/BUILD | 1 - .../build/lib/skyframe/BzlLoadFunction.java | 2 +- .../lib/skyframe/BzlLoadFunctionTest.java | 2 +- .../lib/skyframe/PackageFunctionTest.java | 2 +- .../util/BazelEvaluationTestCase.java | 2 +- 28 files changed, 29 insertions(+), 57 deletions(-) rename src/main/java/com/google/devtools/build/lib/{packages => cmdline}/BazelModuleContext.java (94%) 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 2a3f68112033bc..76cd7ce70b6f36 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD +++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD @@ -1545,7 +1545,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/events", - "//src/main/java/com/google/devtools/build/lib/packages", "//src/main/java/com/google/devtools/build/lib/skyframe:build_configuration", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java index 64b2e9c15ccd23..85f08670e472a1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java @@ -32,11 +32,11 @@ import com.google.devtools.build.lib.buildeventstream.BuildEventIdUtil; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos; import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos.BuildEventId; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.concurrent.BlazeInterners; import com.google.devtools.build.lib.events.EventHandler; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.skyframe.BuildConfigurationKey; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.starlarkbuildapi.BuildConfigurationApi; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java index c4427b938d8af7..20fe8e34d5a478 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.analysis.TargetContext; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.collect.nestedset.NestedSet; @@ -30,7 +31,6 @@ import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Event; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BuiltinProvider; import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.PackageGroup; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java index c10dfa2669d9e0..0839e3fcde9452 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java @@ -23,6 +23,7 @@ import com.google.devtools.build.lib.analysis.config.TransitionFactories; 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.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.Attribute.AllowedValueSet; @@ -30,7 +31,6 @@ import com.google.devtools.build.lib.packages.Attribute.StarlarkComputedDefaultTemplate; import com.google.devtools.build.lib.packages.AttributeTransitionData; import com.google.devtools.build.lib.packages.AttributeValueSource; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.LabelConverter; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java index e56f0922d614cc..c6916323891737 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java @@ -51,6 +51,7 @@ import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; 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.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.LabelValidator; @@ -65,7 +66,6 @@ import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.Attribute.StarlarkComputedDefaultTemplate; import com.google.devtools.build.lib.packages.AttributeValueSource; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.BuildSetting; import com.google.devtools.build.lib.packages.BuildType; diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD index fe599295236618..74130ff4f6b395 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/BUILD @@ -18,7 +18,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster", "//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories", "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:module_extension", - "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:repo_rule_creator", "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:resolution", "//src/main/java/com/google/devtools/build/lib/bazel/debug:workspace-rule-event", "//src/main/java/com/google/devtools/build/lib/bazel/repository", 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 8248ac4724bd76..e3e58c754fb77c 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 @@ -28,12 +28,12 @@ import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtension; import com.google.devtools.build.lib.bazel.bzlmod.ModuleExtensionEvalStarlarkThreadContext; import com.google.devtools.build.lib.bazel.bzlmod.TagClass; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.AttributeValueSource; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.Package.NameConflictException; diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/BUILD b/src/main/java/com/google/devtools/build/lib/cmdline/BUILD index 1acdae6fbc5ad3..c193cea66681e7 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/BUILD +++ b/src/main/java/com/google/devtools/build/lib/cmdline/BUILD @@ -12,6 +12,7 @@ filegroup( java_library( name = "cmdline", srcs = [ + "BazelModuleContext.java", "Label.java", "LabelConstants.java", "ResolvedTargets.java", @@ -43,7 +44,6 @@ java_library( "//src/main/java/net/starlark/java/eval", "//src/main/protobuf:failure_details_java_proto", "//third_party:auto_value", - "//third_party:error_prone_annotations", "//third_party:guava", "//third_party:jsr305", ], diff --git a/src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java b/src/main/java/com/google/devtools/build/lib/cmdline/BazelModuleContext.java similarity index 94% rename from src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java rename to src/main/java/com/google/devtools/build/lib/cmdline/BazelModuleContext.java index 462d41a7342192..cf201595778d89 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/BazelModuleContext.java @@ -12,12 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.packages; +package com.google.devtools.build.lib.cmdline; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.cmdline.RepositoryMapping; import net.starlark.java.eval.Module; /** diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java index 6171b1353cdc5a..061ac56bc661cc 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java @@ -36,6 +36,7 @@ import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkMethod; +import net.starlark.java.eval.Module; import net.starlark.java.eval.Printer; import net.starlark.java.eval.StarlarkSemantics; import net.starlark.java.eval.StarlarkThread; @@ -423,11 +424,12 @@ public Label getLocalTargetLabel(String targetName) throws LabelSyntaxException * {@code //wiz:quux} relative to {@code //foo/bar:baz} is {@code //wiz:quux}. * * @param relName the relative label name; must be non-empty. - * @param thread the Starlark thread, which must provide a thread-local {@code HasRepoMapping}. + * @param thread the Starlark thread. */ @StarlarkMethod( name = "relative", doc = + // TODO(#14503): Fix the documentation. "Resolves a label that is either absolute (starts with //) or relative to " + "the current package. If this label is in a remote repository, the argument will " + "be resolved relative to that repository. If the argument contains a repository " @@ -456,20 +458,9 @@ public Label getLocalTargetLabel(String targetName) throws LabelSyntaxException }, useStarlarkThread = true) public Label getRelative(String relName, StarlarkThread thread) throws LabelSyntaxException { - HasRepoMapping hrm = thread.getThreadLocal(HasRepoMapping.class); - return getRelativeWithRemapping(relName, hrm.getRepoMappingForCurrentBzlFile(thread)); - } - - /** - * An interface for retrieving a repository mapping that's applicable for the repo containing the - * current .bzl file (more precisely, the .bzl file where the function at the innermost Starlark - * stack frame lives). - * - *

This has only a single implementation, {@code BazelStarlarkContext}, but we can't mention - * that type here because logically it belongs in Bazel, above this package. - */ - public interface HasRepoMapping { - RepositoryMapping getRepoMappingForCurrentBzlFile(StarlarkThread thread); + return getRelativeWithRemapping( + relName, + BazelModuleContext.of(Module.ofInnermostEnclosingStarlarkFunction(thread)).repoMapping()); } /** diff --git a/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java b/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java index 655454705b35c7..947ebeb7cd102a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java @@ -20,13 +20,11 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.cmdline.RepositoryMapping; import com.google.devtools.build.lib.cmdline.RepositoryName; import java.util.HashMap; import java.util.Optional; import javax.annotation.Nullable; import net.starlark.java.eval.EvalException; -import net.starlark.java.eval.Module; import net.starlark.java.eval.Starlark; import net.starlark.java.eval.StarlarkThread; @@ -37,9 +35,7 @@ // allowlist. The toolsRepository info will be duplicated between this class and RDE but we can // enforce consistency with a precondition check. public final class BazelStarlarkContext - implements RuleDefinitionEnvironment, - Label.HasRepoMapping, - StarlarkThread.UncheckedExceptionContext { + implements RuleDefinitionEnvironment, StarlarkThread.UncheckedExceptionContext { /** The phase to which this Starlark thread belongs. */ public enum Phase { @@ -56,7 +52,6 @@ public static BazelStarlarkContext from(StarlarkThread thread) { /** Save this BazelStarlarkContext in the specified Starlark thread. */ public void storeInThread(StarlarkThread thread) { thread.setThreadLocal(BazelStarlarkContext.class, this); - thread.setThreadLocal(Label.HasRepoMapping.class, this); thread.setUncheckedExceptionContext(this); } @@ -122,18 +117,6 @@ public ImmutableMap> getFragmentNameToClass() { return fragmentNameToClass; } - /** - * Returns a map of {@code RepositoryName}s where the keys are repository names that are written - * in the BUILD files and the values are new repository names chosen by the main repository. - */ - @Override - public RepositoryMapping getRepoMappingForCurrentBzlFile(StarlarkThread thread) { - // TODO(b/200024947): Find a better place for this. We don't want Label to have to depend on - // StarlarkModuleContext, but having the logic in BazelStarlarkContext is purely a historical - // misstep. - return BazelModuleContext.of(Module.ofInnermostEnclosingStarlarkFunction(thread)).repoMapping(); - } - /** * Returns a String -> Label map of all the Strings that have already been converted to Labels * during package loading of the current package. diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java b/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java index 38b85f4bd481bb..a3fad588187b52 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuiltinRestriction.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.packages; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.RepositoryName; import net.starlark.java.eval.EvalException; import net.starlark.java.eval.Module; diff --git a/src/main/java/com/google/devtools/build/lib/packages/LabelConverter.java b/src/main/java/com/google/devtools/build/lib/packages/LabelConverter.java index b3a8e9a1326ef7..eaca82d7210bf7 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/LabelConverter.java +++ b/src/main/java/com/google/devtools/build/lib/packages/LabelConverter.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.packages; import com.google.common.annotations.VisibleForTesting; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.RepositoryMapping; diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index 1a15703fd4d4a4..2e0d6b27a00b2a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java @@ -22,6 +22,7 @@ import com.google.common.collect.Sets; import com.google.common.flogger.GoogleLogger; import com.google.devtools.build.lib.actions.ThreadStateReceiver; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryMapping; diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java index 48cd35838bc4cb..f87e3f9a8e7953 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java @@ -41,7 +41,7 @@ public final class StarlarkCallbackHelper { // thread that instantiated a rule, must be propagated to // the child threads (implicit outputs, attribute defaults). // This includes any other thread-local state, such as - // the Label.HasRepoMapping or PackageFactory.PackageContext. + // PackageFactory.PackageContext. // TODO(adonovan): it would be cleaner and less error prone to // perform these callbacks in the actual loading-phase thread, // at the end of BUILD file execution. diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java index f29e7ef5535ac2..246372f72d59dc 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java @@ -22,6 +22,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.LabelValidator; diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java index 6acd697a67b930..68f0631af25756 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java @@ -27,10 +27,10 @@ import com.google.devtools.build.lib.analysis.config.Fragment; import com.google.devtools.build.lib.analysis.config.RequiresOptions; import com.google.devtools.build.lib.analysis.starlark.annotations.StarlarkConfigurationField; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions.AppleBitcodeMode; import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType; import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleConfigurationApi; 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 351e8e14b68304..11f30a3e556513 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 @@ -19,8 +19,8 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition; import com.google.devtools.build.lib.analysis.config.StarlarkDefinedConfigTransition.Settings; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.starlarkbuildapi.config.ConfigGlobalLibraryApi; import com.google.devtools.build.lib.starlarkbuildapi.config.ConfigurationTransitionApi; import java.util.HashSet; 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 f3a20df703d941..13169225f6de08 100755 --- 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 @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; 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.BazelModuleContext; 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; @@ -39,7 +40,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.Provider; diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 62668f7735739d..5b7a48102b0c66 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -29,12 +29,12 @@ import com.google.devtools.build.lib.analysis.config.PerLabelOptions; import com.google.devtools.build.lib.analysis.config.RequiresOptions; import com.google.devtools.build.lib.analysis.starlark.annotations.StarlarkConfigurationField; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions; import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions.AppleBitcodeMode; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; 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 ef1223e122db55..6d52a5d0b088bc 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 @@ -183,7 +183,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment", "//src/main/java/com/google/devtools/build/lib/analysis:starlark/args", "//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:transitive_info_collection", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_provider", "//src/main/java/com/google/devtools/build/lib/analysis:transitive_info_provider_map", 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 dbd335d40be8e8..66e3171cd8c442 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 @@ -23,8 +23,8 @@ import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; 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.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.Provider; import com.google.devtools.build.lib.rules.cpp.CcInfo; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.JavaOutput; diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java index 99633dd271e661..916219e83bae91 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java @@ -25,13 +25,13 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.StrictDepsMode; import com.google.devtools.build.lib.analysis.starlark.Args; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.Depset.ElementType; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.BlazeInterners; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.packages.StarlarkInfo; import com.google.devtools.build.lib.vfs.FileSystemUtils; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD index 025d9c0649957c..7f3adfb7ed6ff6 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD @@ -154,7 +154,6 @@ java_library( ":package_roots_no_symlink_creation", ":package_value", ":pattern_expanding_error", - ":per_build_syscall_cache", ":precomputed_function", ":precomputed_value", ":prepare_deps_of_pattern_value", diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java index 692c129ed8e951..b7865e5567f823 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java @@ -24,6 +24,7 @@ import com.google.common.flogger.GoogleLogger; import com.google.common.hash.HashFunction; import com.google.devtools.build.lib.analysis.BlazeDirectories; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelConstants; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; @@ -37,7 +38,6 @@ import com.google.devtools.build.lib.events.ExtendedEventHandler.Postable; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.io.InconsistentFilesystemException; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkEnvironment; import com.google.devtools.build.lib.packages.BuildFileNotFoundException; import com.google.devtools.build.lib.packages.PackageFactory; diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java index 43db1dda0f773b..52bad6288a98af 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java @@ -27,8 +27,8 @@ import com.google.devtools.build.lib.bazel.bzlmod.ModuleFileFunction; import com.google.devtools.build.lib.bazel.repository.RepositoryOptions.CheckDirectDepsMode; import com.google.devtools.build.lib.clock.BlazeClock; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; import com.google.devtools.build.lib.pkgcache.PackageOptions; diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java index 14e77c7722ded9..666476efa4384a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageFunctionTest.java @@ -33,11 +33,11 @@ import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.clock.BlazeClock; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.ExtendedEventHandler; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BuildFileNotFoundException; import com.google.devtools.build.lib.packages.ConstantRuleVisibility; import com.google.devtools.build.lib.packages.NoSuchPackageException; diff --git a/src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java index 361135a7b55615..98a7923755264b 100644 --- a/src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/starlark/util/BazelEvaluationTestCase.java @@ -18,6 +18,7 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.analysis.starlark.StarlarkModules; +import com.google.devtools.build.lib.cmdline.BazelModuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryMapping; import com.google.devtools.build.lib.events.Event; @@ -25,7 +26,6 @@ import com.google.devtools.build.lib.events.EventKind; import com.google.devtools.build.lib.events.ExtendedEventHandler; import com.google.devtools.build.lib.events.util.EventCollectionApparatus; -import com.google.devtools.build.lib.packages.BazelModuleContext; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.SymbolGenerator; import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;