From bc74d1d5d68a569ccab39d1aabed82b3321bf3c6 Mon Sep 17 00:00:00 2001 From: adonovan Date: Thu, 30 Apr 2020 12:08:31 -0700 Subject: [PATCH] bazel syntax: eject Depset from the Starlark interpreter Depset, the Starlark wrapper, now lives alongside NestedSet, the wrapped data type. The interpreter still catches NestedSetException, but now using a string hack since it cannot name the type. Also: - Label.TYPE (a Depset.ElementType) inlined to its sole use in Pinto, to avoid cmdline->nestedset dependency. - depset tests moved from syntax.MethodLibrary to DepsetTest. PiperOrigin-RevId: 309273148 --- .../build/lib/actions/AbstractAction.java | 2 +- .../devtools/build/lib/actions/Artifact.java | 2 +- .../google/devtools/build/lib/analysis/BUILD | 3 +- .../build/lib/analysis/DefaultInfo.java | 2 +- .../build/lib/analysis/FileProvider.java | 2 +- .../build/lib/analysis/OutputGroupInfo.java | 2 +- .../devtools/build/lib/analysis/Runfiles.java | 2 +- .../build/lib/analysis/skylark/Args.java | 2 +- .../SkylarkRuleConfiguredTargetUtil.java | 2 +- .../analysis/skylark/SkylarkRuleContext.java | 2 +- .../skylark/StarlarkActionFactory.java | 2 +- .../analysis/skylark/StarlarkCommandLine.java | 2 +- .../lib/analysis/test/AnalysisFailure.java | 2 +- .../analysis/test/AnalysisFailureInfo.java | 2 +- .../devtools/build/lib/cmdline/Label.java | 4 - .../build/lib/collect/nestedset/BUILD | 3 + .../{syntax => collect/nestedset}/Depset.java | 15 +++- .../google/devtools/build/lib/packages/BUILD | 1 + .../build/lib/packages/SelectorList.java | 2 +- .../build/lib/packages/SkylarkInfo.java | 2 +- .../build/lib/packages/StarlarkLibrary.java | 2 +- .../devtools/build/lib/packages/Type.java | 2 +- .../lib/rules/AliasConfiguredTarget.java | 2 +- .../com/google/devtools/build/lib/rules/BUILD | 1 + .../lib/rules/android/AndroidAssetsInfo.java | 2 +- .../rules/android/AndroidIdeInfoProvider.java | 2 +- .../lib/rules/android/AndroidIdlProvider.java | 2 +- .../rules/android/AndroidLibraryAarInfo.java | 2 +- ...ndroidLibraryResourceClassJarProvider.java | 2 +- .../rules/android/AndroidNativeLibsInfo.java | 2 +- .../rules/android/AndroidResourcesInfo.java | 2 +- .../android/AndroidStarlarkApiProvider.java | 2 +- .../rules/android/ParsedAndroidAssets.java | 2 +- .../android/ValidatedAndroidResources.java | 2 +- .../databinding/DataBindingV2Provider.java | 2 +- .../build/lib/rules/cpp/CcBinary.java | 2 +- .../lib/rules/cpp/CcCompilationContext.java | 2 +- .../build/lib/rules/cpp/CcLinkingContext.java | 2 +- .../build/lib/rules/cpp/CcModule.java | 2 +- .../lib/rules/cpp/CcStarlarkApiProvider.java | 2 +- .../lib/rules/cpp/CcToolchainProvider.java | 2 +- .../lib/rules/cpp/GoogleLegacyStubs.java | 2 +- .../build/lib/rules/cpp/LibraryToLink.java | 2 +- .../java/JavaCompilationInfoProvider.java | 2 +- .../lib/rules/java/JavaGenJarsProvider.java | 2 +- .../build/lib/rules/java/JavaInfo.java | 2 +- .../java/JavaRuntimeClasspathProvider.java | 2 +- .../build/lib/rules/java/JavaRuntimeInfo.java | 2 +- .../lib/rules/java/JavaStarlarkCommon.java | 2 +- .../lib/rules/java/JavaToolchainProvider.java | 2 +- .../lib/rules/java/ProguardSpecProvider.java | 2 +- .../GeneratedExtensionRegistryProvider.java | 2 +- .../rules/objc/AppleDynamicFrameworkInfo.java | 2 +- .../lib/rules/objc/AppleSkylarkCommon.java | 2 +- .../build/lib/rules/objc/ObjcProvider.java | 2 +- .../objc/ObjcProviderSkylarkConverters.java | 2 +- .../build/lib/rules/proto/ProtoInfo.java | 2 +- .../build/lib/rules/python/PyInfo.java | 4 +- .../build/lib/rules/python/PyRuntimeInfo.java | 2 +- .../build/lib/rules/python/PyStructUtils.java | 2 +- .../build/lib/skylarkbuildapi/ActionApi.java | 2 +- .../devtools/build/lib/skylarkbuildapi/BUILD | 1 + .../skylarkbuildapi/CommandLineArgsApi.java | 2 +- .../lib/skylarkbuildapi/DefaultInfoApi.java | 2 +- .../lib/skylarkbuildapi/FileProviderApi.java | 2 +- .../lib/skylarkbuildapi/ProtoInfoApi.java | 2 +- .../lib/skylarkbuildapi/RunfilesApi.java | 2 +- .../SkylarkRuleContextApi.java | 2 +- .../StarlarkActionFactoryApi.java | 2 +- .../StarlarkCommandLineApi.java | 2 +- .../android/AndroidAssetsInfoApi.java | 2 +- .../android/AndroidIdeInfoProviderApi.java | 2 +- .../android/AndroidIdlProviderApi.java | 2 +- .../android/AndroidLibraryAarInfoApi.java | 2 +- ...oidLibraryResourceClassJarProviderApi.java | 2 +- .../android/AndroidNativeLibsInfoApi.java | 2 +- .../android/AndroidResourcesInfoApi.java | 2 +- .../android/AndroidSkylarkApiProviderApi.java | 2 +- .../build/lib/skylarkbuildapi/android/BUILD | 1 + .../android/DataBindingV2ProviderApi.java | 2 +- .../skylarkbuildapi/apple/AppleCommonApi.java | 2 +- .../apple/AppleDynamicFrameworkInfoApi.java | 2 +- .../build/lib/skylarkbuildapi/apple/BUILD | 1 + .../apple/ObjcProviderApi.java | 2 +- .../build/lib/skylarkbuildapi/cpp/BUILD | 1 + .../skylarkbuildapi/cpp/BazelCcModuleApi.java | 2 +- .../cpp/CcCompilationContextApi.java | 2 +- .../cpp/CcLinkingContextApi.java | 2 +- .../lib/skylarkbuildapi/cpp/CcModuleApi.java | 2 +- .../cpp/CcSkylarkApiProviderApi.java | 2 +- .../cpp/CcToolchainProviderApi.java | 2 +- .../cpp/GoWrapCcHelperApi.java | 2 +- .../cpp/PyWrapCcHelperApi.java | 2 +- .../skylarkbuildapi/cpp/WrapCcHelperApi.java | 2 +- .../build/lib/skylarkbuildapi/java/BUILD | 1 + ...GeneratedExtensionRegistryProviderApi.java | 2 +- .../java/JavaAnnotationProcessingApi.java | 2 +- .../skylarkbuildapi/java/JavaCommonApi.java | 2 +- .../java/JavaCompilationInfoProviderApi.java | 2 +- .../lib/skylarkbuildapi/java/JavaInfoApi.java | 2 +- .../java/JavaRuntimeClasspathProviderApi.java | 2 +- .../java/JavaRuntimeInfoApi.java | 2 +- .../JavaToolchainSkylarkApiProviderApi.java | 2 +- .../java/ProguardSpecProviderApi.java | 2 +- .../build/lib/skylarkbuildapi/proto/BUILD | 1 + .../proto/ProtoRegistryProviderApi.java | 2 +- .../build/lib/skylarkbuildapi/python/BUILD | 1 + .../lib/skylarkbuildapi/python/PyInfoApi.java | 2 +- .../python/PyRuntimeInfoApi.java | 2 +- .../test/AnalysisFailureInfoApi.java | 2 +- .../build/lib/skylarkbuildapi/test/BUILD | 1 + .../server/DebuggerSerialization.java | 2 +- .../google/devtools/build/lib/syntax/BUILD | 2 - .../build/lib/syntax/MethodLibrary.java | 38 +++++---- .../devtools/build/skydoc/SkydocMain.java | 2 +- .../devtools/build/skydoc/fakebuildapi/BUILD | 1 + .../FakeStarlarkCommandLineApi.java | 2 +- .../build/skydoc/fakebuildapi/android/BUILD | 1 + .../android/FakeAndroidNativeLibsInfo.java | 2 +- .../android/FakeAndroidResourcesInfo.java | 2 +- .../build/skydoc/fakebuildapi/apple/BUILD | 1 + .../apple/FakeAppleDynamicFrameworkInfo.java | 2 +- .../fakebuildapi/apple/FakeObjcProvider.java | 2 +- .../build/skydoc/fakebuildapi/cpp/BUILD | 1 + .../fakebuildapi/cpp/FakeGoWrapCcHelper.java | 2 +- .../fakebuildapi/cpp/FakePyWrapCcHelper.java | 2 +- .../build/skydoc/fakebuildapi/java/BUILD | 1 + .../fakebuildapi/java/FakeJavaCommon.java | 2 +- .../fakebuildapi/java/FakeJavaInfo.java | 2 +- .../java/FakeJavaRuntimeInfoApi.java | 2 +- ...akeJavaToolchainSkylarkApiProviderApi.java | 2 +- .../build/skydoc/fakebuildapi/proto/BUILD | 1 + .../fakebuildapi/proto/FakeProtoInfo.java | 2 +- .../build/skydoc/fakebuildapi/python/BUILD | 1 + .../fakebuildapi/python/FakePyInfo.java | 2 +- .../python/FakePyRuntimeInfo.java | 2 +- .../com/google/devtools/build/docgen/BUILD | 1 + .../docgen/StarlarkDocumentationTest.java | 2 +- .../java/com/google/devtools/build/lib/BUILD | 2 + .../nestedset}/DepsetTest.java | 77 +++++++++++++++++-- .../devtools/build/lib/packages/TypeTest.java | 2 +- .../lib/rules/cpp/StarlarkCcCommonTest.java | 2 +- .../lib/rules/java/JavaSkylarkApiTest.java | 2 +- .../lib/rules/objc/ObjcProviderTest.java | 2 +- .../build/lib/rules/objc/ObjcSkylarkTest.java | 2 +- .../lib/rules/python/PyStructUtilsTest.java | 2 +- .../TrimmableTestConfigurationFragments.java | 2 +- .../skylark/SkylarkDefinedAspectsTest.java | 2 +- .../lib/skylark/SkylarkIntegrationTest.java | 2 +- .../SkylarkRuleClassFunctionsTest.java | 2 +- .../lib/skylark/SkylarkRuleContextTest.java | 2 +- ...kylarkRuleImplementationFunctionsTest.java | 2 +- .../server/DebuggerSerializationTest.java | 2 +- .../build/lib/syntax/MethodLibraryTest.java | 63 --------------- 154 files changed, 256 insertions(+), 225 deletions(-) rename src/main/java/com/google/devtools/build/lib/{syntax => collect/nestedset}/Depset.java (97%) rename src/test/java/com/google/devtools/build/lib/{syntax => collect/nestedset}/DepsetTest.java (85%) diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java index a9d6c5dc235b26..5fd6790563a193 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java +++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java @@ -21,6 +21,7 @@ import com.google.devtools.build.lib.actions.extra.ExtraActionInfo; import com.google.devtools.build.lib.analysis.platform.PlatformInfo; 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.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -32,7 +33,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.skylarkbuildapi.ActionApi; import com.google.devtools.build.lib.skylarkbuildapi.CommandLineArgsApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Printer; diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java index 7fc1908c19bd17..c22d52cd682ce9 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java +++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java @@ -32,6 +32,7 @@ import com.google.devtools.build.lib.actions.ArtifactResolver.ArtifactResolverSupplier; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelConstants; +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.BlazeInterners; import com.google.devtools.build.lib.concurrent.ThreadSafety; @@ -42,7 +43,6 @@ import com.google.devtools.build.lib.skyframe.serialization.SerializationException; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Printer; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.vfs.Path; 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 cd35341edfbf6b..39f7ac2a752aaa 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD +++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD @@ -742,7 +742,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", ], ) @@ -2051,6 +2050,7 @@ java_library( srcs = ["test/AnalysisFailure.java"], deps = [ "//src/main/java/com/google/devtools/build/lib/cmdline", + "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test", "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", ], @@ -2064,7 +2064,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/packages", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test", - "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", ], ) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java index d6db2dd99550c1..a631d22bdfec6b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java @@ -14,11 +14,11 @@ package com.google.devtools.build.lib.analysis; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.BuiltinProvider; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.skylarkbuildapi.DefaultInfoApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.syntax.Starlark; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java index fa3bda672254e4..227dc3d1c2167a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java @@ -15,13 +15,13 @@ package com.google.devtools.build.lib.analysis; import com.google.devtools.build.lib.actions.Artifact; +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; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkbuildapi.FileProviderApi; -import com.google.devtools.build.lib.syntax.Depset; /** * A representation of the concept "this transitive info provider builds these files". 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 e034d6df3c212b..30cfd0e558a839 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 @@ -21,6 +21,7 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleConfiguredTargetUtil; +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; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -29,7 +30,6 @@ import com.google.devtools.build.lib.packages.StructImpl; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkbuildapi.OutputGroupInfoApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java index 889c56a662e825..ad76b9c4fb0331 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactPathResolver; import com.google.devtools.build.lib.cmdline.LabelConstants; +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; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -36,7 +37,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; import com.google.devtools.build.lib.skylarkbuildapi.SymlinkEntryApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.syntax.Printer; import com.google.devtools.build.lib.util.Fingerprint; 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/skylark/Args.java index 4745bb74c3eebb..086b1667c4ee19 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java @@ -24,10 +24,10 @@ 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.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skylarkbuildapi.CommandLineArgsApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.syntax.Mutability; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java index 33d45aefeda2be..6e699c71e35854 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java @@ -31,6 +31,7 @@ import com.google.devtools.build.lib.analysis.Whitelist; import com.google.devtools.build.lib.analysis.test.CoverageCommon; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesInfo; +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.NestedSet.NestedSetDepthException; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -50,7 +51,6 @@ import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.packages.TargetUtils; import com.google.devtools.build.lib.packages.Type; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalExceptionWithStackTrace; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java index 65fb4bf96daeed..21cf343012d55a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java @@ -56,6 +56,7 @@ import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesInfo; import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.packages.Aspect; import com.google.devtools.build.lib.packages.AspectDescriptor; import com.google.devtools.build.lib.packages.Attribute; @@ -77,7 +78,6 @@ import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.syntax.ClassObject; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalUtils; 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/skylark/StarlarkActionFactory.java index 0d69128743aeaf..05cd88103baaa2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java @@ -43,6 +43,7 @@ import com.google.devtools.build.lib.analysis.actions.Substitution; import com.google.devtools.build.lib.analysis.actions.SymlinkAction; import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction; +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; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -50,7 +51,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Printer; 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/skylark/StarlarkCommandLine.java index 8503179dfb9e6f..a3b6ee986c38c7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkCommandLine.java @@ -15,9 +15,9 @@ package com.google.devtools.build.lib.analysis.skylark; import com.google.devtools.build.lib.actions.Artifact; +import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkCommandLineApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.EvalException; /** A Starlark module class to create memory efficient command lines. */ diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailure.java b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailure.java index 1c400328a377b1..a8adaa7961937d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailure.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailure.java @@ -15,8 +15,8 @@ package com.google.devtools.build.lib.analysis.test; import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.test.AnalysisFailureApi; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Printer; /** diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java index 1d8477d401a6d4..07819ad70f1490 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java @@ -13,12 +13,12 @@ // limitations under the License. package com.google.devtools.build.lib.analysis.test; +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; import com.google.devtools.build.lib.packages.BuiltinProvider; import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.skylarkbuildapi.test.AnalysisFailureInfoApi; -import com.google.devtools.build.lib.syntax.Depset; /** * Implementation of {@link AnalysisFailureInfoApi}. 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 6e40a4e4851e59..f1358e81d948ef 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 @@ -28,7 +28,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; -import com.google.devtools.build.lib.syntax.Depset; import com.google.devtools.build.lib.syntax.Printer; import com.google.devtools.build.lib.syntax.StarlarkSemantics; import com.google.devtools.build.lib.syntax.StarlarkThread; @@ -61,9 +60,6 @@ public final class Label implements Comparable