From 0ce17480390cdced2df8d59249561613e81f446f Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 3 Mar 2023 22:35:08 -0800 Subject: [PATCH] Replace uses of Depset.of(ElementType, NestedSet) with Depset.of(Class, NestedSet) The former method was deprecated. Do only the trivial changes. Other changes will be done separately to make the review easier. PiperOrigin-RevId: 514004311 Change-Id: Iacf51f3ef3e16c4dfb32158ae1d0ed3b0c899fe0 --- .../build/lib/actions/AbstractAction.java | 4 +- .../build/lib/analysis/DefaultInfo.java | 2 +- .../build/lib/analysis/FileProvider.java | 2 +- .../build/lib/analysis/OutputGroupInfo.java | 4 +- .../devtools/build/lib/analysis/Runfiles.java | 11 ++---- .../starlark/StarlarkRuleContext.java | 2 +- .../lib/analysis/test/AnalysisFailure.java | 5 --- .../analysis/test/AnalysisFailureInfo.java | 2 +- .../analysis/test/InstrumentedFilesInfo.java | 4 +- .../lib/rules/AliasConfiguredTarget.java | 2 +- .../lib/rules/android/AndroidAssetsInfo.java | 10 ++--- .../android/AndroidBinaryNativeLibsInfo.java | 4 +- .../rules/android/AndroidIdeInfoProvider.java | 2 +- .../lib/rules/android/AndroidIdlProvider.java | 8 ++-- .../rules/android/AndroidLibraryAarInfo.java | 2 +- ...ndroidLibraryResourceClassJarProvider.java | 2 +- .../rules/android/AndroidNativeLibsInfo.java | 2 +- .../AndroidNeverLinkLibrariesProvider.java | 2 +- .../rules/android/AndroidResourcesInfo.java | 20 +++++----- .../android/AndroidStarlarkApiProvider.java | 2 +- .../android/BaselineProfileProvider.java | 2 +- .../rules/android/ParsedAndroidAssets.java | 4 -- .../android/ValidatedAndroidResources.java | 5 --- .../databinding/DataBindingV2Provider.java | 8 ++-- .../lib/rules/cpp/CcCompilationContext.java | 26 ++++++------- .../lib/rules/cpp/CcCompilationOutputs.java | 4 +- .../lib/rules/cpp/CcDebugInfoContext.java | 4 +- .../devtools/build/lib/rules/cpp/CcInfo.java | 3 +- .../build/lib/rules/cpp/CcLinkingContext.java | 15 +++----- .../lib/rules/cpp/CcToolchainProvider.java | 24 ++++++------ .../lib/rules/cpp/ExtraLinkTimeLibraries.java | 4 +- .../build/lib/rules/cpp/LibraryToLink.java | 3 -- .../build/lib/rules/java/AndroidLintTool.java | 5 +-- .../java/JavaCompilationInfoProvider.java | 4 +- .../lib/rules/java/JavaGenJarsProvider.java | 6 +-- .../build/lib/rules/java/JavaInfo.java | 13 +++---- .../rules/java/JavaModuleFlagsProvider.java | 4 +- .../JavaPackageConfigurationProvider.java | 2 +- .../build/lib/rules/java/JavaPluginInfo.java | 6 +-- .../java/JavaRuntimeClasspathProvider.java | 2 +- .../build/lib/rules/java/JavaRuntimeInfo.java | 4 +- .../lib/rules/java/JavaStarlarkCommon.java | 4 +- .../lib/rules/java/JavaToolchainProvider.java | 7 ++-- .../lib/rules/java/ProguardSpecProvider.java | 2 +- .../GeneratedExtensionRegistryProvider.java | 2 +- .../rules/objc/AppleDynamicFrameworkInfo.java | 4 +- .../lib/rules/objc/AppleStarlarkCommon.java | 2 +- .../lib/rules/objc/CompilationAttributes.java | 19 +++++----- .../build/lib/rules/objc/ObjcProvider.java | 38 +++++++++---------- .../objc/ObjcProviderStarlarkConverters.java | 2 +- .../build/lib/rules/python/PyInfo.java | 6 +-- .../build/lib/rules/python/PyRuntimeInfo.java | 8 ++-- .../android/DataBindingV2ProviderApi.java | 3 -- .../devtools/build/lib/packages/TypeTest.java | 3 +- .../lib/rules/objc/ObjcProviderTest.java | 2 +- .../server/DebuggerSerializationTest.java | 5 +-- 56 files changed, 156 insertions(+), 191 deletions(-) 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 e76a72dcfedf13..0a91ee6b06fd0c 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 @@ -684,12 +684,12 @@ public NestedSet getInputFilesForExtraAction( @Override public Depset getStarlarkInputs() { - return Depset.of(Artifact.TYPE, getInputs()); + return Depset.of(Artifact.class, getInputs()); } @Override public Depset getStarlarkOutputs() { - return Depset.of(Artifact.TYPE, NestedSetBuilder.wrap(Order.STABLE_ORDER, getOutputs())); + return Depset.of(Artifact.class, NestedSetBuilder.wrap(Order.STABLE_ORDER, getOutputs())); } @Override 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 64cc96db2c0c84..1e098b71bfcdcf 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 @@ -147,7 +147,7 @@ private static class DelegatingDefaultInfo extends DefaultInfo { @Nullable @Override public Depset getFiles() { - return Depset.of(Artifact.TYPE, target.getProvider(FileProvider.class).getFilesToBuild()); + return Depset.of(Artifact.class, target.getProvider(FileProvider.class).getFilesToBuild()); } @Nullable 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 4ddf21ab0c32e8..b2247ffba262ef 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 @@ -60,7 +60,7 @@ public boolean isImmutable() { */ @Override public Depset /**/ getFilesToBuildForStarlark() { - return Depset.of(Artifact.TYPE, filesToBuild); + return Depset.of(Artifact.class, filesToBuild); } public NestedSet getFilesToBuild() { 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 44720d8c8d9352..80bf721ac17d67 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 @@ -287,7 +287,7 @@ public Object getIndex(StarlarkSemantics semantics, Object key) throws EvalExcep NestedSet result = outputGroups.get(key); if (result != null) { - return Depset.of(Artifact.TYPE, result); + return Depset.of(Artifact.class, result); } else { throw Starlark.errorf("Output group %s not present", key); } @@ -310,7 +310,7 @@ public Object getValue(String name) { if (result == null) { return null; } - return Depset.of(Artifact.TYPE, result); + return Depset.of(Artifact.class, result); } @Override 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 00a4fe5f6a486f..54ad5a049b3a46 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 @@ -111,9 +111,6 @@ public Iterable getExtraPaths(Set manifestPaths) { // // Goodnight, prince(ss)?, and sweet dreams. public static final class SymlinkEntry implements SymlinkEntryApi { - - static final Depset.ElementType TYPE = Depset.ElementType.of(SymlinkEntry.class); - private final PathFragment path; private final Artifact artifact; @@ -270,7 +267,7 @@ public NestedSet getExtraMiddlemen() { /** Returns the collection of runfiles as artifacts. */ @Override public Depset /**/ getArtifactsForStarlark() { - return Depset.of(Artifact.TYPE, artifacts); + return Depset.of(Artifact.class, artifacts); } public NestedSet getArtifacts() { @@ -280,7 +277,7 @@ public NestedSet getArtifacts() { /** Returns the symlinks. */ @Override public Depset /**/ getSymlinksForStarlark() { - return Depset.of(SymlinkEntry.TYPE, symlinks); + return Depset.of(SymlinkEntry.class, symlinks); } public NestedSet getSymlinks() { @@ -289,7 +286,7 @@ public NestedSet getSymlinks() { @Override public Depset /**/ getEmptyFilenamesForStarlark() { - return Depset.of(Depset.ElementType.STRING, getEmptyFilenames()); + return Depset.of(String.class, getEmptyFilenames()); } public NestedSet getEmptyFilenames() { @@ -512,7 +509,7 @@ private static boolean isUnderWorkspace(PathFragment path) { /** Returns the root symlinks. */ @Override public Depset /**/ getRootSymlinksForStarlark() { - return Depset.of(SymlinkEntry.TYPE, rootSymlinks); + return Depset.of(SymlinkEntry.class, rootSymlinks); } public NestedSet getRootSymlinks() { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java index ce3cd43032e1e9..a7d14a2bb5366f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java @@ -1120,7 +1120,7 @@ public Tuple resolveTools(Sequence tools) throws EvalException { .addToolDependencies(Sequence.cast(tools, TransitiveInfoCollection.class, "tools")) .build(); return Tuple.pair( - Depset.of(Artifact.TYPE, helper.getResolvedTools()), helper.getToolsRunfilesSuppliers()); + Depset.of(Artifact.class, helper.getResolvedTools()), helper.getToolsRunfilesSuppliers()); } public StarlarkSemantics getStarlarkSemantics() { 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 98559491726aa3..65fb0cd33483aa 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,7 +15,6 @@ 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.starlarkbuildapi.test.AnalysisFailureApi; import net.starlark.java.eval.Printer; @@ -23,10 +22,6 @@ * Encapsulates information about an analysis-phase error which would have occurred during a build. */ public class AnalysisFailure implements AnalysisFailureApi { - - /** The Starlark type symbol for AnalysisFailure values. */ - public static final Depset.ElementType TYPE = Depset.ElementType.of(AnalysisFailure.class); - private final Label label; private final String message; 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 246120ceeade99..e14862a5833054 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 @@ -67,7 +67,7 @@ public static AnalysisFailureInfo forAnalysisFailureSets( @Override public Depset /**/ getCauses() { - return Depset.of(AnalysisFailure.TYPE, causes); + return Depset.of(AnalysisFailure.class, causes); } public NestedSet getCausesNestedSet() { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java index 291076d00f25c2..12798ce0f1e751 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java @@ -77,7 +77,7 @@ public NestedSet getInstrumentedFiles() { @Override public Depset getInstrumentedFilesForStarlark() { - return Depset.of(Artifact.TYPE, getInstrumentedFiles()); + return Depset.of(Artifact.class, getInstrumentedFiles()); } /** Returns a collection of instrumentation metadata files. */ @@ -87,7 +87,7 @@ public NestedSet getInstrumentationMetadataFiles() { @Override public Depset getInstrumentationMetadataFilesForStarlark() { - return Depset.of(Artifact.TYPE, getInstrumentationMetadataFiles()); + return Depset.of(Artifact.class, getInstrumentationMetadataFiles()); } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java index b68e2fa9bcae57..27148faf0b927a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java +++ b/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java @@ -168,7 +168,7 @@ public Object getValue(String name) { // A shortcut for files to build in Starlark. FileConfiguredTarget and RuleConfiguredTarget // always has FileProvider and Error- and PackageGroupConfiguredTarget-s shouldn't be // accessible in Starlark. - return Depset.of(Artifact.TYPE, getProvider(FileProvider.class).getFilesToBuild()); + return Depset.of(Artifact.class, getProvider(FileProvider.class).getFilesToBuild()); } return actual.getValue(name); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java index 40fa2a88f62bf2..245a594e1e329b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java @@ -114,7 +114,7 @@ public Artifact getValidationResult() { @Override public Depset /**/ getDirectParsedAssetsForStarlark() { - return Depset.of(ParsedAndroidAssets.TYPE, directParsedAssets); + return Depset.of(ParsedAndroidAssets.class, directParsedAssets); } public NestedSet getDirectParsedAssets() { @@ -135,7 +135,7 @@ public String getLocalAssetDir() { @Override public Depset /**/ getTransitiveParsedAssetsForStarlark() { - return Depset.of(ParsedAndroidAssets.TYPE, transitiveParsedAssets); + return Depset.of(ParsedAndroidAssets.class, transitiveParsedAssets); } public NestedSet getTransitiveParsedAssets() { @@ -144,7 +144,7 @@ public NestedSet getTransitiveParsedAssets() { @Override public Depset /**/ getAssetsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveAssets); + return Depset.of(Artifact.class, transitiveAssets); } public NestedSet getAssets() { @@ -153,7 +153,7 @@ public NestedSet getAssets() { @Override public Depset /**/ getSymbolsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveSymbols); + return Depset.of(Artifact.class, transitiveSymbols); } public NestedSet getSymbols() { @@ -168,7 +168,7 @@ private Optional getLocalParsedAndroidAssets() { @Override public Depset /**/ getCompiledSymbolsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveCompiledSymbols); + return Depset.of(Artifact.class, transitiveCompiledSymbols); } NestedSet getCompiledSymbols() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryNativeLibsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryNativeLibsInfo.java index e6e56ca068317f..ac43dc2f2662af 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryNativeLibsInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryNativeLibsInfo.java @@ -57,7 +57,7 @@ public Dict getNativeLibsStarlark() { return null; } return Dict.immutableCopyOf( - Maps.transformValues(nativeLibs.getMap(), set -> Depset.of(Artifact.TYPE, set))); + Maps.transformValues(nativeLibs.getMap(), set -> Depset.of(Artifact.class, set))); } @Nullable @@ -75,7 +75,7 @@ public Depset getTransitiveNativeLibsStarlark() { if (transitiveNativeLibs == null) { return null; } - return Depset.of(Artifact.TYPE, transitiveNativeLibs); + return Depset.of(Artifact.class, transitiveNativeLibs); } @Nullable diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java index 18308977fd8027..3b27a92c700b54 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java @@ -324,7 +324,7 @@ public ImmutableMap> getNativeLibs() { public ImmutableMap getNativeLibsStarlark() { ImmutableMap.Builder builder = ImmutableMap.builder(); for (Map.Entry> entry : getNativeLibs().entrySet()) { - builder.put(entry.getKey(), Depset.of(Artifact.TYPE, entry.getValue())); + builder.put(entry.getKey(), Depset.of(Artifact.class, entry.getValue())); } return builder.buildOrThrow(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java index b60b920bd3ec41..d3911f981555f7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java @@ -56,7 +56,7 @@ public Provider getProvider() { @Override public Depset /**/ getTransitiveIdlImportRootsForStarlark() { - return Depset.of(Depset.ElementType.STRING, transitiveIdlImportRoots); + return Depset.of(String.class, transitiveIdlImportRoots); } NestedSet getTransitiveIdlImportRoots() { @@ -65,7 +65,7 @@ NestedSet getTransitiveIdlImportRoots() { @Override public Depset /**/ getTransitiveIdlImportsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveIdlImports); + return Depset.of(Artifact.class, transitiveIdlImports); } NestedSet getTransitiveIdlImports() { @@ -74,7 +74,7 @@ NestedSet getTransitiveIdlImports() { @Override public Depset /**/ getTransitiveIdlJarsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveIdlJars); + return Depset.of(Artifact.class, transitiveIdlJars); } NestedSet getTransitiveIdlJars() { @@ -83,7 +83,7 @@ NestedSet getTransitiveIdlJars() { @Override public Depset /**/ getTransitiveIdlPreprocessedForStarlark() { - return Depset.of(Artifact.TYPE, transitiveIdlPreprocessed); + return Depset.of(Artifact.class, transitiveIdlPreprocessed); } NestedSet getTransitiveIdlPreprocessed() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java index 504c9fbbc3db74..22b0574326507c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java @@ -85,7 +85,7 @@ public NestedSet getTransitiveAars() { @Override public Depset /**/ getTransitiveAarArtifactsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveAarArtifacts); + return Depset.of(Artifact.class, transitiveAarArtifacts); } public NestedSet getTransitiveAarArtifacts() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java index 801cd81d501293..c83c67fa33df41 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java @@ -57,7 +57,7 @@ public static AndroidLibraryResourceClassJarProvider create( @Override public Depset /**/ getResourceClassJarsForStarlark() { - return Depset.of(Artifact.TYPE, resourceClassJars); + return Depset.of(Artifact.class, resourceClassJars); } public NestedSet getResourceClassJars() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNativeLibsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNativeLibsInfo.java index e019cc3814560c..87fe83533d7c97 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNativeLibsInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNativeLibsInfo.java @@ -47,7 +47,7 @@ public AndroidNativeLibsInfoProvider getProvider() { @Override public Depset /**/ getNativeLibsForStarlark() { - return Depset.of(Artifact.TYPE, nativeLibs); + return Depset.of(Artifact.class, nativeLibs); } NestedSet getNativeLibs() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverLinkLibrariesProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverLinkLibrariesProvider.java index 4a8f88caf0f7e4..8b97b7039cc1fb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverLinkLibrariesProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverLinkLibrariesProvider.java @@ -61,7 +61,7 @@ public NestedSet getTransitiveNeverLinkLibraries() { @Override public Depset /**/ getTransitiveNeverLinkLibrariesForStarlark() { - return Depset.of(Artifact.TYPE, transitiveNeverLinkLibraries); + return Depset.of(Artifact.class, transitiveNeverLinkLibraries); } /** Provider class for {@link AndroidNeverLinkLibrariesProvider} objects. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesInfo.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesInfo.java index 28f216f9104382..e1022745bd6451 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesInfo.java @@ -116,7 +116,7 @@ public Artifact getRTxt() { @Override public Depset /**/ getTransitiveAndroidResourcesForStarlark() { - return Depset.of(ValidatedAndroidResources.TYPE, transitiveAndroidResources); + return Depset.of(ValidatedAndroidResources.class, transitiveAndroidResources); } public NestedSet getTransitiveAndroidResources() { @@ -125,7 +125,7 @@ public NestedSet getTransitiveAndroidResources() { @Override public Depset /**/ getDirectAndroidResourcesForStarlark() { - return Depset.of(ValidatedAndroidResources.TYPE, directAndroidResources); + return Depset.of(ValidatedAndroidResources.class, directAndroidResources); } public NestedSet getDirectAndroidResources() { @@ -134,7 +134,7 @@ public NestedSet getDirectAndroidResources() { @Override public Depset /**/ getTransitiveResourcesForStarlark() { - return Depset.of(Artifact.TYPE, transitiveResources); + return Depset.of(Artifact.class, transitiveResources); } public NestedSet getTransitiveResources() { @@ -143,7 +143,7 @@ public NestedSet getTransitiveResources() { @Override public Depset /**/ getTransitiveManifestsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveManifests); + return Depset.of(Artifact.class, transitiveManifests); } public NestedSet getTransitiveManifests() { @@ -152,7 +152,7 @@ public NestedSet getTransitiveManifests() { @Override public Depset /**/ getTransitiveAapt2RTxtForStarlark() { - return Depset.of(Artifact.TYPE, transitiveAapt2RTxt); + return Depset.of(Artifact.class, transitiveAapt2RTxt); } public NestedSet getTransitiveAapt2RTxt() { @@ -161,7 +161,7 @@ public NestedSet getTransitiveAapt2RTxt() { @Override public Depset /**/ getTransitiveAapt2ValidationArtifactsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveAapt2ValidationArtifacts); + return Depset.of(Artifact.class, transitiveAapt2ValidationArtifacts); } NestedSet getTransitiveAapt2ValidationArtifacts() { @@ -170,7 +170,7 @@ NestedSet getTransitiveAapt2ValidationArtifacts() { @Override public Depset /**/ getTransitiveSymbolsBinForStarlark() { - return Depset.of(Artifact.TYPE, transitiveSymbolsBin); + return Depset.of(Artifact.class, transitiveSymbolsBin); } public NestedSet getTransitiveSymbolsBin() { @@ -179,7 +179,7 @@ public NestedSet getTransitiveSymbolsBin() { @Override public Depset /**/ getTransitiveCompiledSymbolsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveCompiledSymbols); + return Depset.of(Artifact.class, transitiveCompiledSymbols); } NestedSet getTransitiveCompiledSymbols() { @@ -188,7 +188,7 @@ NestedSet getTransitiveCompiledSymbols() { @Override public Depset /**/ getTransitiveStaticLibForStarlark() { - return Depset.of(Artifact.TYPE, transitiveStaticLib); + return Depset.of(Artifact.class, transitiveStaticLib); } NestedSet getTransitiveStaticLib() { @@ -197,7 +197,7 @@ NestedSet getTransitiveStaticLib() { @Override public Depset /**/ getTransitiveRTxtForStarlark() { - return Depset.of(Artifact.TYPE, transitiveRTxt); + return Depset.of(Artifact.class, transitiveRTxt); } NestedSet getTransitiveRTxt() { 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 23692b27f0f128..4f28991de4db3c 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 @@ -102,7 +102,7 @@ public IdlInfo getIdlInfo() { @Override public Depset /**/ getResources() { return Depset.of( - Artifact.TYPE, collectDirectArtifacts(ValidatedAndroidResources::getResources)); + Artifact.class, collectDirectArtifacts(ValidatedAndroidResources::getResources)); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/BaselineProfileProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/BaselineProfileProvider.java index 28880b2c308a2f..4fb9b64617b021 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/BaselineProfileProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/BaselineProfileProvider.java @@ -49,7 +49,7 @@ public Provider getProvider() { @Override public Depset /**/ getTransitiveBaselineProfilesForStarlark() { - return Depset.of(Artifact.TYPE, transitiveBaselineProfiles); + return Depset.of(Artifact.class, transitiveBaselineProfiles); } public NestedSet getTransitiveBaselineProfiles() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java index 508842deafca37..b3c1f08a447d72 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidAssets.java @@ -15,16 +15,12 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.starlarkbuildapi.android.ParsedAndroidAssetsApi; import java.util.Objects; import javax.annotation.Nullable; /** Parsed Android assets which can be merged together with assets from dependencies. */ public class ParsedAndroidAssets extends AndroidAssets implements ParsedAndroidAssetsApi { - - public static final Depset.ElementType TYPE = Depset.ElementType.of(ParsedAndroidAssets.class); - private final Artifact symbols; @Nullable private final Artifact compiledSymbols; private final Label label; diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidResources.java b/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidResources.java index fa46add7a3dc72..05a9ec1664bdf1 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidResources.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ValidatedAndroidResources.java @@ -15,7 +15,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.RuleErrorConsumer; -import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.starlarkbuildapi.android.ValidatedAndroidDataApi; import java.util.Objects; @@ -27,10 +26,6 @@ /** Wraps validated and packaged Android resource information */ public class ValidatedAndroidResources extends MergedAndroidResources implements ValidatedAndroidDataApi { - - public static final Depset.ElementType TYPE = - Depset.ElementType.of(ValidatedAndroidResources.class); - private final Artifact rTxt; private final Artifact sourceJar; private final Artifact apk; diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/databinding/DataBindingV2Provider.java b/src/main/java/com/google/devtools/build/lib/rules/android/databinding/DataBindingV2Provider.java index 8fc80b43a4a22a..c6c5d9ebd610ad 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/databinding/DataBindingV2Provider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/databinding/DataBindingV2Provider.java @@ -67,7 +67,7 @@ public Provider getProvider() { @Override public Depset /**/ getClassInfosForStarlark() { - return Depset.of(Artifact.TYPE, classInfos); + return Depset.of(Artifact.class, classInfos); } public NestedSet getClassInfos() { @@ -76,7 +76,7 @@ public NestedSet getClassInfos() { @Override public Depset /**/ getSetterStoresForStarlark() { - return Depset.of(Artifact.TYPE, setterStores); + return Depset.of(Artifact.class, setterStores); } public NestedSet getSetterStores() { @@ -85,7 +85,7 @@ public NestedSet getSetterStores() { @Override public Depset /**/ getTransitiveBRFilesForStarlark() { - return Depset.of(Artifact.TYPE, transitiveBRFiles); + return Depset.of(Artifact.class, transitiveBRFiles); } public NestedSet getTransitiveBRFiles() { @@ -99,7 +99,7 @@ public ImmutableList getLabelAndJavaPackages() { @Override public Depset /**/ getTransitiveLabelAndJavaPackagesForStarlark() { - return Depset.of(LabelJavaPackagePair.TYPE, transitiveLabelAndJavaPackages); + return Depset.of(LabelJavaPackagePair.class, transitiveLabelAndJavaPackages); } public NestedSet getTransitiveLabelAndJavaPackages() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java index 26c8a4a5f4f4de..b9cf2afdcc9bf3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java @@ -158,20 +158,18 @@ public boolean isImmutable() { @Override public Depset getStarlarkDefines() { - return Depset.of( - Depset.ElementType.STRING, NestedSetBuilder.wrap(Order.STABLE_ORDER, getDefines())); + return Depset.of(String.class, NestedSetBuilder.wrap(Order.STABLE_ORDER, getDefines())); } @Override public Depset getStarlarkNonTransitiveDefines() { return Depset.of( - Depset.ElementType.STRING, - NestedSetBuilder.wrap(Order.STABLE_ORDER, getNonTransitiveDefines())); + String.class, NestedSetBuilder.wrap(Order.STABLE_ORDER, getNonTransitiveDefines())); } @Override public Depset getStarlarkHeaders() { - return Depset.of(Artifact.TYPE, getDeclaredIncludeSrcs()); + return Depset.of(Artifact.class, getDeclaredIncludeSrcs()); } @Override @@ -202,7 +200,7 @@ public StarlarkList getStarlarkDirectTextualHeaders() { @Override public Depset getStarlarkSystemIncludeDirs() { return Depset.of( - Depset.ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.STABLE_ORDER, getSystemIncludeDirs().stream() @@ -213,7 +211,7 @@ public Depset getStarlarkSystemIncludeDirs() { @Override public Depset getStarlarkFrameworkIncludeDirs() { return Depset.of( - Depset.ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.STABLE_ORDER, getFrameworkIncludeDirs().stream() @@ -224,7 +222,7 @@ public Depset getStarlarkFrameworkIncludeDirs() { @Override public Depset getStarlarkIncludeDirs() { return Depset.of( - Depset.ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.STABLE_ORDER, getIncludeDirs().stream() @@ -235,7 +233,7 @@ public Depset getStarlarkIncludeDirs() { @Override public Depset getStarlarkQuoteIncludeDirs() { return Depset.of( - Depset.ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.STABLE_ORDER, getQuoteIncludeDirs().stream() @@ -247,18 +245,18 @@ public Depset getStarlarkQuoteIncludeDirs() { public Depset getStarlarkTransitiveCompilationPrerequisites(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getTransitiveCompilationPrerequisites()); + return Depset.of(Artifact.class, getTransitiveCompilationPrerequisites()); } @Override public Depset getStarlarkValidationArtifacts() { - return Depset.of(Artifact.TYPE, getHeaderTokens()); + return Depset.of(Artifact.class, getHeaderTokens()); } @Override public Depset getStarlarkVirtualToOriginalHeaders(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Depset.ElementType.of(Tuple.class), getVirtualToOriginalHeaders()); + return Depset.of(Tuple.class, getVirtualToOriginalHeaders()); } /** @@ -555,7 +553,7 @@ public NestedSet getTransitiveModules(boolean usePic) { public Depset getStarlarkTransitiveModules(boolean usePic, StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getTransitiveModules(usePic)); + return Depset.of(Artifact.class, getTransitiveModules(usePic)); } /** @@ -571,7 +569,7 @@ public NestedSet getAdditionalInputs() { @Override public Depset getStarlarkAdditionalInputs(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getAdditionalInputs()); + return Depset.of(Artifact.class, getAdditionalInputs()); } /** Adds additional transitive inputs needed for compilation to builder. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java index ddfcfae385b6b4..0f050f4b314ebe 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java @@ -126,14 +126,14 @@ public Sequence getStarlarkPicObjects() throws EvalException { @Override public Depset getStarlarkTemps(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getTemps()); + return Depset.of(Artifact.class, getTemps()); } @Override public Depset getStarlarkFilesToCompile( boolean parseHeaders, boolean usePic, StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getFilesToCompile(parseHeaders, usePic)); + return Depset.of(Artifact.class, getFilesToCompile(parseHeaders, usePic)); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcDebugInfoContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcDebugInfoContext.java index 687f0944e249e6..35b41b7672ba87 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcDebugInfoContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcDebugInfoContext.java @@ -82,12 +82,12 @@ public NestedSet getTransitivePicDwoFiles() { @Override public Depset getStarlarkTransitiveFiles() { - return Depset.of(Artifact.TYPE, getTransitiveDwoFiles()); + return Depset.of(Artifact.class, getTransitiveDwoFiles()); } @Override public Depset getStarlarkTransitivePicFiles() { - return Depset.of(Artifact.TYPE, getTransitivePicDwoFiles()); + return Depset.of(Artifact.class, getTransitivePicDwoFiles()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcInfo.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcInfo.java index 946caf61c47e8a..2d9fde2224891f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcInfo.java @@ -77,7 +77,8 @@ public CcDebugInfoContext getCcDebugInfoContextFromStarlark(StarlarkThread threa @Override public Depset getCcTransitiveNativeLibraries(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(LibraryToLink.TYPE, getCcNativeLibraryInfo().getTransitiveCcNativeLibraries()); + return Depset.of( + LibraryToLink.class, getCcNativeLibraryInfo().getTransitiveCcNativeLibraries()); } public CcDebugInfoContext getCcDebugInfoContext() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java index 098d85012ee4ca..d8c6fae57a5a88 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java @@ -114,8 +114,6 @@ public static final class Linkstamp implements LinkstampApi { private final NestedSet declaredIncludeSrcs; private final int nestedDigest; - public static final Depset.ElementType TYPE = Depset.ElementType.of(Linkstamp.class); - // TODO(janakr): if action key context is not available, the digest can be computed lazily, // only if we are doing an equality comparison and artifacts are equal. That should never // happen, so doing an expensive digest should be ok then. If this is ever moved to Starlark @@ -154,7 +152,7 @@ public NestedSet getDeclaredIncludeSrcs() { @Override public Depset getDeclaredIncludeSrcsForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getDeclaredIncludeSrcs()); + return Depset.of(Artifact.class, getDeclaredIncludeSrcs()); } @Override @@ -189,9 +187,6 @@ public boolean equals(Object obj) { @Immutable public static class LinkerInput implements LinkerInputApi { - - public static final Depset.ElementType TYPE = Depset.ElementType.of(LinkerInput.class); - // Identifies which target created the LinkerInput. It doesn't have to be unique between // LinkerInputs. private final Label owner; @@ -473,7 +468,7 @@ public NestedSet getLinkerInputs() { @Override public Depset getStarlarkLinkerInputs() { - return Depset.of(LinkerInput.TYPE, linkerInputs); + return Depset.of(LinkerInput.class, linkerInputs); } @Override @@ -485,7 +480,7 @@ public Sequence getStarlarkUserLinkFlags() { public Object getStarlarkLibrariesToLink(StarlarkSemantics semantics) { // TODO(plf): Flag can be removed already. if (semantics.getBool(BuildLanguageOptions.INCOMPATIBLE_DEPSET_FOR_LIBRARIES_TO_LINK_GETTER)) { - return Depset.of(LibraryToLink.TYPE, getLibraries()); + return Depset.of(LibraryToLink.class, getLibraries()); } else { return StarlarkList.immutableCopyOf(getLibraries().toList()); } @@ -493,7 +488,7 @@ public Object getStarlarkLibrariesToLink(StarlarkSemantics semantics) { @Override public Depset getStarlarkNonCodeInputs() { - return Depset.of(Artifact.TYPE, getNonCodeInputs()); + return Depset.of(Artifact.class, getNonCodeInputs()); } public NestedSet getUserLinkFlags() { @@ -522,7 +517,7 @@ public NestedSet getLinkstamps() { @Override public Depset getLinkstampsForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Linkstamp.TYPE, getLinkstamps()); + return Depset.of(Linkstamp.class, getLinkstamps()); } public NestedSet getNonCodeInputs() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java index 7e544d6d65144f..c285a47433998b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java @@ -431,14 +431,14 @@ public ImmutableList getBuiltInIncludeDirectoriesAsStrings() { @Override public Depset getAllFilesForStarlark() { - return Depset.of(Artifact.TYPE, getAllFiles()); + return Depset.of(Artifact.class, getAllFiles()); } @Override public Depset getStaticRuntimeLibForStarlark( FeatureConfigurationForStarlark featureConfigurationForStarlark) throws EvalException { return Depset.of( - Artifact.TYPE, + Artifact.class, getStaticRuntimeLinkInputs(featureConfigurationForStarlark.getFeatureConfiguration())); } @@ -446,7 +446,7 @@ public Depset getStaticRuntimeLibForStarlark( public Depset getDynamicRuntimeLibForStarlark( FeatureConfigurationForStarlark featureConfigurationForStarlark) throws EvalException { return Depset.of( - Artifact.TYPE, + Artifact.class, getDynamicRuntimeLinkInputs(featureConfigurationForStarlark.getFeatureConfiguration())); } @@ -473,7 +473,7 @@ public NestedSet getAllFilesIncludingLibc() { @Override public Depset getAllFilesIncludingLibcForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getAllFilesIncludingLibc()); + return Depset.of(Artifact.class, getAllFilesIncludingLibc()); } /** Returns the files necessary for compilation. */ @@ -484,7 +484,7 @@ public NestedSet getCompilerFiles() { @Override public Depset getCompilerFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getCompilerFiles()); + return Depset.of(Artifact.class, getCompilerFiles()); } /** @@ -507,7 +507,7 @@ public NestedSet getStripFiles() { @Override public Depset getStripFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getStripFiles()); + return Depset.of(Artifact.class, getStripFiles()); } /** Returns the files necessary for an 'objcopy' invocation. */ @@ -518,7 +518,7 @@ public NestedSet getObjcopyFiles() { @Override public Depset getObjcopyFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getObjcopyFiles()); + return Depset.of(Artifact.class, getObjcopyFiles()); } /** @@ -532,7 +532,7 @@ public NestedSet getAsFiles() { @Override public Depset getAsFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getAsFiles()); + return Depset.of(Artifact.class, getAsFiles()); } /** @@ -546,7 +546,7 @@ public NestedSet getArFiles() { @Override public Depset getArFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getArFiles()); + return Depset.of(Artifact.class, getArFiles()); } /** Returns the files necessary for linking, including the files needed for libc. */ @@ -557,7 +557,7 @@ public NestedSet getLinkerFiles() { @Override public Depset getLinkerFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getLinkerFiles()); + return Depset.of(Artifact.class, getLinkerFiles()); } public NestedSet getDwpFiles() { @@ -567,7 +567,7 @@ public NestedSet getDwpFiles() { @Override public Depset getDwpFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getDwpFiles()); + return Depset.of(Artifact.class, getDwpFiles()); } /** Returns the files necessary for capturing code coverage. */ @@ -578,7 +578,7 @@ public NestedSet getCoverageFiles() { @Override public Depset getCoverageFilesForStarlark(StarlarkThread thread) throws EvalException { CcModule.checkPrivateStarlarkificationAllowlist(thread); - return Depset.of(Artifact.TYPE, getCoverageFiles()); + return Depset.of(Artifact.class, getCoverageFiles()); } public NestedSet getLibcLink(CppConfiguration cppConfiguration) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java index cf27040f28e5d1..e3f138dfbdb3e2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ExtraLinkTimeLibraries.java @@ -146,8 +146,8 @@ public Tuple getBuildLibrariesForStarlark( BuildLibraryOutput buildLibraryOutput = buildLibraries(starlarkRuleContext.getRuleContext(), staticMode, forDynamicLibrary); Depset linkerInputs = - Depset.of(CcLinkingContext.LinkerInput.TYPE, buildLibraryOutput.getLinkerInputs()); - Depset runtimeLibraries = Depset.of(Artifact.TYPE, buildLibraryOutput.getRuntimeLibraries()); + Depset.of(CcLinkingContext.LinkerInput.class, buildLibraryOutput.getLinkerInputs()); + Depset runtimeLibraries = Depset.of(Artifact.class, buildLibraryOutput.getRuntimeLibraries()); return Tuple.pair(linkerInputs, runtimeLibraries); } catch (RuleErrorException e) { throw new EvalException(e); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java index d456c5964cbd43..d97ebd2981a464 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; 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.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.starlarkbuildapi.cpp.LibraryToLinkApi; @@ -41,8 +40,6 @@ @Immutable public abstract class LibraryToLink implements LibraryToLinkApi { - public static final Depset.ElementType TYPE = Depset.ElementType.of(LibraryToLink.class); - public static ImmutableList getDynamicLibrariesForRuntime( boolean linkingStatically, Iterable libraries) { ImmutableList.Builder dynamicLibrariesForRuntimeBuilder = ImmutableList.builder(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/AndroidLintTool.java b/src/main/java/com/google/devtools/build/lib/rules/java/AndroidLintTool.java index aa1808b8cb499b..33877b8f900a7e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/AndroidLintTool.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/AndroidLintTool.java @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; 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 javax.annotation.Nullable; import net.starlark.java.annot.StarlarkMethod; import net.starlark.java.eval.Sequence; @@ -82,12 +81,12 @@ public FilesToRunProvider starlarkTool() { @StarlarkMethod(name = "jvm_opts", documented = false, structField = true) public Depset starlarkJvmOpts() { - return Depset.of(ElementType.STRING, tool().jvmOpts()); + return Depset.of(String.class, tool().jvmOpts()); } @StarlarkMethod(name = "data", documented = false, structField = true) public Depset starlarkData() { - return Depset.of(Artifact.TYPE, tool().data()); + return Depset.of(Artifact.class, tool().data()); } @StarlarkMethod(name = "lint_opts", documented = false, structField = true) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationInfoProvider.java index dbeb8a4c56e46f..5fe6529013045c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationInfoProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationInfoProvider.java @@ -86,13 +86,13 @@ public ImmutableList getJavacOpts() { @Override @Nullable public Depset /**/ getRuntimeClasspath() { - return runtimeClasspath == null ? null : Depset.of(Artifact.TYPE, runtimeClasspath); + return runtimeClasspath == null ? null : Depset.of(Artifact.class, runtimeClasspath); } @Override @Nullable public Depset /**/ getCompilationClasspath() { - return compilationClasspath == null ? null : Depset.of(Artifact.TYPE, compilationClasspath); + return compilationClasspath == null ? null : Depset.of(Artifact.class, compilationClasspath); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaGenJarsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaGenJarsProvider.java index 7d6a53461605bb..7d0a8aa3bfd132 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaGenJarsProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaGenJarsProvider.java @@ -165,7 +165,7 @@ public Artifact getGenSourceJar() { @Override public Depset /**/ getTransitiveGenClassJarsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveGenClassJars); + return Depset.of(Artifact.class, transitiveGenClassJars); } NestedSet getTransitiveGenClassJars() { @@ -174,7 +174,7 @@ NestedSet getTransitiveGenClassJars() { @Override public Depset /**/ getTransitiveGenSourceJarsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveGenSourceJars); + return Depset.of(Artifact.class, transitiveGenSourceJars); } NestedSet getTransitiveGenSourceJars() { @@ -183,7 +183,7 @@ NestedSet getTransitiveGenSourceJars() { @Override public Depset /**/ getProcessorClasspathForStarlark() { - return Depset.of(Artifact.TYPE, processorClasspath); + return Depset.of(Artifact.class, processorClasspath); } NestedSet getProcessorClasspath() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java index 07e381ace25a8e..e271d854ce1551 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java @@ -38,7 +38,6 @@ import com.google.devtools.build.lib.starlarkbuildapi.FileApi; import com.google.devtools.build.lib.starlarkbuildapi.cpp.CcInfoApi; import com.google.devtools.build.lib.starlarkbuildapi.java.JavaInfoApi; -import com.google.devtools.build.lib.starlarkbuildapi.java.JavaInfoApi.JavaInfoProviderApi; import com.google.devtools.build.lib.starlarkbuildapi.java.JavaModuleFlagsProviderApi; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.ArrayList; @@ -292,7 +291,7 @@ public Boolean isNeverlink() { getProviderAsNestedSet( JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getDirectCompileTimeJars); - return Depset.of(Artifact.TYPE, compileTimeJars); + return Depset.of(Artifact.class, compileTimeJars); } @Override @@ -301,7 +300,7 @@ public Depset getFullCompileTimeJars() { getProviderAsNestedSet( JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getDirectFullCompileTimeJars); - return Depset.of(Artifact.TYPE, fullCompileTimeJars); + return Depset.of(Artifact.class, fullCompileTimeJars); } @Override @@ -347,7 +346,7 @@ public ImmutableList getDirectRuntimeJars() { @Override public Depset /**/ getTransitiveDeps() { return Depset.of( - Artifact.TYPE, + Artifact.class, getProviderAsNestedSet( JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getTransitiveCompileTimeJars)); @@ -356,7 +355,7 @@ public ImmutableList getDirectRuntimeJars() { @Override public Depset /**/ getTransitiveRuntimeDeps() { return Depset.of( - Artifact.TYPE, + Artifact.class, getProviderAsNestedSet( JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getRuntimeJars)); } @@ -364,7 +363,7 @@ public ImmutableList getDirectRuntimeJars() { @Override public Depset /**/ getTransitiveSourceJars() { return Depset.of( - Artifact.TYPE, + Artifact.class, getProviderAsNestedSet( JavaSourceJarsProvider.class, JavaSourceJarsProvider::getTransitiveSourceJars)); } @@ -378,7 +377,7 @@ public NestedSet getTransitiveNativeLibraries() { @Override public Depset /**/ getTransitiveNativeLibrariesForStarlark() { - return Depset.of(LibraryToLink.TYPE, getTransitiveNativeLibraries()); + return Depset.of(LibraryToLink.class, getTransitiveNativeLibraries()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaModuleFlagsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaModuleFlagsProvider.java index 93a51e9eb08680..1337a65112d89d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaModuleFlagsProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaModuleFlagsProvider.java @@ -50,12 +50,12 @@ public NestedSet addOpens() { @Override public Depset /*String*/ getAddExports() { - return Depset.of(Depset.ElementType.STRING, addExports); + return Depset.of(String.class, addExports); } @Override public Depset /*String*/ getAddOpens() { - return Depset.of(Depset.ElementType.STRING, addOpens); + return Depset.of(String.class, addOpens); } public JavaModuleFlagsProvider(NestedSet addExports, NestedSet addOpens) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationProvider.java index 174d14e4d77c34..ed1ad7b781f31c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationProvider.java @@ -96,7 +96,7 @@ public Sequence starlarkJavacOpts(StarlarkThread starlarkThread) throws @StarlarkMethod(name = "data", documented = false, useStarlarkThread = true) public Depset starlarkData(StarlarkThread starlarkThread) throws EvalException { checkPrivateAccess(starlarkThread); - return Depset.of(Artifact.TYPE, data()); + return Depset.of(Artifact.class, data()); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfo.java index 0fc7dad85039d4..24c9a3c180a5c0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginInfo.java @@ -137,17 +137,17 @@ public static JavaPluginData merge(Iterable plugins) { @Override public Depset /**/ getProcessorJarsForStarlark() { - return Depset.of(Artifact.TYPE, processorClasspath()); + return Depset.of(Artifact.class, processorClasspath()); } @Override public Depset /**/ getProcessorClassesForStarlark() { - return Depset.of(Depset.ElementType.STRING, processorClasses()); + return Depset.of(String.class, processorClasses()); } @Override public Depset /**/ getProcessorDataForStarlark() { - return Depset.of(Artifact.TYPE, data()); + return Depset.of(Artifact.class, data()); } public boolean isEmpty() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeClasspathProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeClasspathProvider.java index 18f446eeb174d3..aa0e89f3f9d7dc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeClasspathProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeClasspathProvider.java @@ -44,7 +44,7 @@ public boolean isImmutable() { /** Returns the artifacts included on the runtime classpath of this binary. */ @Override public Depset /**/ getRuntimeClasspath() { - return Depset.of(Artifact.TYPE, runtimeClasspath); + return Depset.of(Artifact.class, runtimeClasspath); } public NestedSet getRuntimeClasspathNestedSet() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java index 5d0cd11f1a9efc..d8f91904543a40 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java @@ -195,7 +195,7 @@ public NestedSet hermeticInputs() { @Override public Depset starlarkHermeticInputs() { - return Depset.of(Artifact.TYPE, hermeticInputs()); + return Depset.of(Artifact.class, hermeticInputs()); } @Override @@ -229,7 +229,7 @@ public Sequence starlarkHermeticStaticLibs() { @Override public Depset starlarkJavaBaseInputs() { - return Depset.of(Artifact.TYPE, javaBaseInputs()); + return Depset.of(Artifact.class, javaBaseInputs()); } @Override 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 145ebbe632d006..703f869ceae233 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 @@ -505,11 +505,11 @@ public Depset getRuntimeClasspathForArchive( return runtimeClasspath; } else { return Depset.of( - Artifact.TYPE, + Artifact.class, NestedSetBuilder.wrap( Order.STABLE_ORDER, Iterables.filter( - runtimeClasspath.toList(), + runtimeClasspath.toList(Artifact.class), Predicates.not(Predicates.in(excludedArtifacts.getSet().toSet()))))); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java index 3ceb05bc1aead9..730099c30d116c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; 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.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.BuiltinProvider; @@ -498,17 +497,17 @@ public String getTargetVersion() { @Override public Depset getStarlarkBootclasspath() { - return Depset.of(Artifact.TYPE, getBootclasspath().bootclasspath()); + return Depset.of(Artifact.class, getBootclasspath().bootclasspath()); } @Override public Depset getStarlarkJvmOptions() { - return Depset.of(ElementType.STRING, getJvmOptions()); + return Depset.of(String.class, getJvmOptions()); } @Override public Depset getStarlarkTools() { - return Depset.of(Artifact.TYPE, getTools()); + return Depset.of(Artifact.class, getTools()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardSpecProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardSpecProvider.java index fe9f82fa0f82b5..f86b5736802f94 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardSpecProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardSpecProvider.java @@ -44,7 +44,7 @@ public Provider getProvider() { @Override public Depset /**/ getTransitiveProguardSpecsForStarlark() { - return Depset.of(Artifact.TYPE, transitiveProguardSpecs); + return Depset.of(Artifact.class, transitiveProguardSpecs); } public NestedSet getTransitiveProguardSpecs() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java index b028f89dd893ca..ef0386692d7f0f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/GeneratedExtensionRegistryProvider.java @@ -72,7 +72,7 @@ public Artifact getSrcJar() { /** @return the proto jars used to generate the registry. */ @Override public Depset /**/ getInputsForStarlark() { - return Depset.of(Artifact.TYPE, inputs); + return Depset.of(Artifact.class, inputs); } public NestedSet getInputs() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java index a19c1d8ac36d6d..9ea4ab98f22fb3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java @@ -78,12 +78,12 @@ public BuiltinProvider getProvider() { @Override public Depset /**/ getDynamicFrameworkDirs() { - return Depset.of(Depset.ElementType.STRING, dynamicFrameworkDirs); + return Depset.of(String.class, dynamicFrameworkDirs); } @Override public Depset /**/ getDynamicFrameworkFiles() { - return Depset.of(Artifact.TYPE, dynamicFrameworkFiles); + return Depset.of(Artifact.class, dynamicFrameworkFiles); } @Override 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 bbc8c97bdfe45a..081864ab439038 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 @@ -362,7 +362,7 @@ private StructImpl createStarlarkLinkingOutputs( // instead of plain NestedSets because the Starlark caller may want to return this directly from // their implementation function. Map outputGroups = - Maps.transformValues(linkingOutputs.getOutputGroups(), v -> Depset.of(Artifact.TYPE, v)); + Maps.transformValues(linkingOutputs.getOutputGroups(), v -> Depset.of(Artifact.class, v)); ImmutableMap.Builder fields = ImmutableMap.builder(); fields.put("objc", linkingOutputs.getDepsObjcProvider()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java index 9adf9b420ad05b..3628179279f894 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.RuleContext; 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.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -353,12 +352,12 @@ public NestedSet hdrs() { @StarlarkMethod(name = "hdrs", documented = false, structField = true) public Depset hdrsForStarlark() { - return Depset.of(Artifact.TYPE, hdrs()); + return Depset.of(Artifact.class, hdrs()); } @StarlarkMethod(name = "textual_hdrs", documented = false, structField = true) public Depset textualHdrsForStarlark() { - return Depset.of(Artifact.TYPE, textualHdrs()); + return Depset.of(Artifact.class, textualHdrs()); } /** @@ -378,7 +377,7 @@ public NestedSet includes() { @StarlarkMethod(name = "includes", documented = false, structField = true) public Depset includesForStarlark() { return Depset.of( - ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.COMPILE_ORDER, includes().toList().stream() @@ -389,7 +388,7 @@ public Depset includesForStarlark() { @StarlarkMethod(name = "sdk_includes", documented = false, structField = true) public Depset sdkIncludesForStarlark() { return Depset.of( - ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.COMPILE_ORDER, sdkIncludes().toList().stream() @@ -411,12 +410,12 @@ public NestedSet sdkFrameworks() { @StarlarkMethod(name = "sdk_frameworks", documented = false, structField = true) public Depset sdkFrameworksForStarlark() { - return Depset.of(ElementType.STRING, sdkFrameworks); + return Depset.of(String.class, sdkFrameworks); } @StarlarkMethod(name = "weak_sdk_frameworks", documented = false, structField = true) public Depset weakSdkFrameworksForStarlark() { - return Depset.of(ElementType.STRING, weakSdkFrameworks); + return Depset.of(String.class, weakSdkFrameworks); } /** Returns the SDK frameworks to be linked weakly. */ @@ -426,7 +425,7 @@ public NestedSet weakSdkFrameworks() { @StarlarkMethod(name = "sdk_dylibs", documented = false, structField = true) public Depset sdkDylibsForStarlark() { - return Depset.of(ElementType.STRING, sdkDylibs); + return Depset.of(String.class, sdkDylibs); } /** @@ -444,8 +443,8 @@ public NestedSet sdkDylibs() { }) public Depset headerSearchPathsForStarlark(String genfilesDir) { return Depset.of( - ElementType.STRING, - NestedSetBuilder.stableOrder() + String.class, + NestedSetBuilder.stableOrder() .addAll( headerSearchPaths(PathFragment.create(genfilesDir)).toList().stream() .map(PathFragment::toString) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java index f2f23d25a1398a..954eee51015059 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java @@ -256,7 +256,7 @@ public ImmutableList getStrictDependencyIncludes() { @Override public Depset /**/ dynamicFrameworkFileForStarlark() { - return Depset.of(Artifact.TYPE, dynamicFrameworkFile()); + return Depset.of(Artifact.class, dynamicFrameworkFile()); } NestedSet dynamicFrameworkFile() { @@ -265,18 +265,18 @@ NestedSet dynamicFrameworkFile() { @Override public Depset /**/ forceLoadLibrary() { - return Depset.of(Artifact.TYPE, get(FORCE_LOAD_LIBRARY)); + return Depset.of(Artifact.class, get(FORCE_LOAD_LIBRARY)); } @Override public Depset /**/ importedLibrary() { - return Depset.of(Artifact.TYPE, get(IMPORTED_LIBRARY)); + return Depset.of(Artifact.class, get(IMPORTED_LIBRARY)); } @Override public Depset /**/ strictIncludeForStarlark() { return Depset.of( - Depset.ElementType.STRING, + String.class, NestedSetBuilder.wrap( Order.STABLE_ORDER, getStrictDependencyIncludes().stream() @@ -286,27 +286,27 @@ NestedSet dynamicFrameworkFile() { @Override public Depset /**/ j2objcLibrary() { - return Depset.of(Artifact.TYPE, get(J2OBJC_LIBRARY)); + return Depset.of(Artifact.class, get(J2OBJC_LIBRARY)); } @Override public Depset /**/ library() { - return Depset.of(Artifact.TYPE, get(LIBRARY)); + return Depset.of(Artifact.class, get(LIBRARY)); } @Override public Depset /**/ linkInputs() { - return Depset.of(Artifact.TYPE, get(LINK_INPUTS)); + return Depset.of(Artifact.class, get(LINK_INPUTS)); } @Override public Depset /**/ linkopt() { - return Depset.of(Depset.ElementType.STRING, get(LINKOPT)); + return Depset.of(String.class, get(LINKOPT)); } @Override public Depset /**/ moduleMap() { - return Depset.of(Artifact.TYPE, get(MODULE_MAP)); + return Depset.of(Artifact.class, get(MODULE_MAP)); } @Override @@ -316,17 +316,17 @@ public Sequence directModuleMaps() { @Override public Depset /**/ sdkDylib() { - return Depset.of(Depset.ElementType.STRING, get(SDK_DYLIB)); + return Depset.of(String.class, get(SDK_DYLIB)); } @Override public Depset sdkFramework() { - return Depset.of(Depset.ElementType.STRING, get(SDK_FRAMEWORK)); + return Depset.of(String.class, get(SDK_FRAMEWORK)); } @Override public Depset /**/ sourceForStarlark() { - return Depset.of(Artifact.TYPE, source()); + return Depset.of(Artifact.class, source()); } NestedSet source() { @@ -340,7 +340,7 @@ public Sequence directSources() { @Override public Depset /**/ staticFrameworkFileForStarlark() { - return Depset.of(Artifact.TYPE, staticFrameworkFile()); + return Depset.of(Artifact.class, staticFrameworkFile()); } NestedSet staticFrameworkFile() { @@ -349,12 +349,12 @@ NestedSet staticFrameworkFile() { @Override public Depset /**/ umbrellaHeader() { - return Depset.of(Artifact.TYPE, get(UMBRELLA_HEADER)); + return Depset.of(Artifact.class, get(UMBRELLA_HEADER)); } @Override public Depset weakSdkFramework() { - return Depset.of(Depset.ElementType.STRING, get(WEAK_SDK_FRAMEWORK)); + return Depset.of(String.class, get(WEAK_SDK_FRAMEWORK)); } /** @@ -721,7 +721,7 @@ private NestedSet getFrameworkPaths(Key key) { @Override public Depset /**/ dynamicFrameworkNamesForStarlark() { - return Depset.of(Depset.ElementType.STRING, dynamicFrameworkNames()); + return Depset.of(String.class, dynamicFrameworkNames()); } NestedSet dynamicFrameworkNames() { @@ -730,7 +730,7 @@ NestedSet dynamicFrameworkNames() { @Override public Depset /**/ dynamicFrameworkPathsForStarlark() { - return Depset.of(Depset.ElementType.STRING, dynamicFrameworkPaths()); + return Depset.of(String.class, dynamicFrameworkPaths()); } NestedSet dynamicFrameworkPaths() { @@ -739,7 +739,7 @@ NestedSet dynamicFrameworkPaths() { @Override public Depset /**/ staticFrameworkNamesForStarlark() { - return Depset.of(Depset.ElementType.STRING, staticFrameworkNames()); + return Depset.of(String.class, staticFrameworkNames()); } NestedSet staticFrameworkNames() { @@ -748,7 +748,7 @@ NestedSet staticFrameworkNames() { @Override public Depset /**/ staticFrameworkPathsForStarlark() { - return Depset.of(Depset.ElementType.STRING, staticFrameworkPaths()); + return Depset.of(String.class, staticFrameworkPaths()); } NestedSet staticFrameworkPaths() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java index eaef6e617106fd..0e3e86568785d8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java @@ -61,7 +61,7 @@ public static Depset convertPathFragmentsToStarlark(NestedSet path for (PathFragment path : pathFragments.toList()) { result.add(path.getSafePathString()); } - return Depset.of(Depset.ElementType.STRING, result.build()); + return Depset.of(String.class, result.build()); } /** A converter for ObjcProvider values. */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java index d853092e8f7843..b7b84d9c86bb94 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java @@ -196,7 +196,7 @@ public PyInfo constructor( throws EvalException { Depset imports = importsUncast.equals(Starlark.UNBOUND) - ? Depset.of(Depset.ElementType.STRING, NestedSetBuilder.emptySet(Order.COMPILE_ORDER)) + ? Depset.of(String.class, NestedSetBuilder.emptySet(Order.COMPILE_ORDER)) : (Depset) importsUncast; if (!depsetHasTypeAndCompatibleOrder(transitiveSources, Artifact.TYPE, Order.COMPILE_ORDER)) { @@ -280,9 +280,9 @@ public PyInfo build() { Preconditions.checkNotNull(transitiveSources); return new PyInfo( location, - Depset.of(Artifact.TYPE, transitiveSources), + Depset.of(Artifact.class, transitiveSources), usesSharedLibraries, - Depset.of(Depset.ElementType.STRING, imports), + Depset.of(String.class, imports), hasPy2OnlySources, hasPy3OnlySources); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java index a3d3be07baeb0e..a6839ca62d4b29 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfo.java @@ -116,9 +116,9 @@ public static PyRuntimeInfo createForInBuildRuntime( /* location= */ null, /* interpreterPath= */ null, interpreter, - Depset.of(Artifact.TYPE, files), + Depset.of(Artifact.class, files), coverageTool, - coverageFiles == null ? null : Depset.of(Artifact.TYPE, coverageFiles), + coverageFiles == null ? null : Depset.of(Artifact.class, coverageFiles), pythonVersion, stubShebang, bootstrapTemplate); @@ -138,7 +138,7 @@ public static PyRuntimeInfo createForPlatformRuntime( /* interpreter= */ null, /* files= */ null, coverageTool, - coverageFiles == null ? null : Depset.of(Artifact.TYPE, coverageFiles), + coverageFiles == null ? null : Depset.of(Artifact.class, coverageFiles), pythonVersion, stubShebang, bootstrapTemplate); @@ -320,7 +320,7 @@ public PyRuntimeInfo constructor( Location loc = thread.getCallerLocation(); if (isInBuildRuntime) { if (filesDepset == null) { - filesDepset = Depset.of(Artifact.TYPE, NestedSetBuilder.emptySet(Order.STABLE_ORDER)); + filesDepset = Depset.of(Artifact.class, NestedSetBuilder.emptySet(Order.STABLE_ORDER)); } return new PyRuntimeInfo( loc, diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/DataBindingV2ProviderApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/DataBindingV2ProviderApi.java index eb863137ce9c3a..51842164a9ee6a 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/DataBindingV2ProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/android/DataBindingV2ProviderApi.java @@ -53,9 +53,6 @@ public interface DataBindingV2ProviderApi extends StructApi { + "it, you will be broken when it is removed.", documented = false) final class LabelJavaPackagePair implements StarlarkValue { - - public static final Depset.ElementType TYPE = Depset.ElementType.of(LabelJavaPackagePair.class); - private final String label; private final String javaPackage; diff --git a/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java b/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java index 7f2a67a878a952..7f98e1c8c3f2ef 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/TypeTest.java @@ -303,8 +303,7 @@ public void testStringListBadElements() throws Exception { @Test public void testListDepsetConversion() throws Exception { Object input = - Depset.of( - Depset.ElementType.STRING, NestedSetBuilder.create(Order.STABLE_ORDER, "a", "b", "c")); + Depset.of(String.class, NestedSetBuilder.create(Order.STABLE_ORDER, "a", "b", "c")); Type.STRING_LIST.convert(input, null); } diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java index 6a1fe2ef21cd0f..19072f9b4d5547 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java @@ -111,7 +111,7 @@ public void directFieldsAddAll() { public void directFieldsAddFromStarlark() throws Exception { ImmutableList artifacts = ImmutableList.of(createArtifact("/foo"), createArtifact("/bar")); - Depset set = Depset.of(Artifact.TYPE, NestedSetBuilder.wrap(Order.STABLE_ORDER, artifacts)); + Depset set = Depset.of(Artifact.class, NestedSetBuilder.wrap(Order.STABLE_ORDER, artifacts)); ObjcProvider.StarlarkBuilder builder = objcProviderBuilder(); builder.addElementsFromStarlark(ObjcProvider.SOURCE, set); builder.addElementsFromStarlark(ObjcProvider.MODULE_MAP, set); diff --git a/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java index 459a7ef071c07c..3262b4b3aad393 100644 --- a/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java +++ b/src/test/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerializationTest.java @@ -60,8 +60,7 @@ private ImmutableList getChildren(Value value) { public void testSimpleNestedSet() { Set children = ImmutableSet.of("a", "b"); Depset set = - Depset.of( - Depset.ElementType.STRING, NestedSetBuilder.stableOrder().addAll(children).build()); + Depset.of(String.class, NestedSetBuilder.stableOrder().addAll(children).build()); Value value = getValueProto("name", set); @@ -90,7 +89,7 @@ public void testNestedSetWithNestedChildren() { ImmutableSet directChildren = ImmutableSet.of("a", "b"); Depset outerSet = Depset.of( - Depset.ElementType.STRING, + String.class, NestedSetBuilder.linkOrder() .addAll(directChildren) .addTransitive(innerNestedSet)