Skip to content

Commit 0ce1748

Browse files
comiuscopybara-github
comius
authored and
copybara-github
committed
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
1 parent 05253dc commit 0ce1748

File tree

56 files changed

+156
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+156
-191
lines changed

‎src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,12 +684,12 @@ public NestedSet<Artifact> getInputFilesForExtraAction(
684684

685685
@Override
686686
public Depset getStarlarkInputs() {
687-
return Depset.of(Artifact.TYPE, getInputs());
687+
return Depset.of(Artifact.class, getInputs());
688688
}
689689

690690
@Override
691691
public Depset getStarlarkOutputs() {
692-
return Depset.of(Artifact.TYPE, NestedSetBuilder.wrap(Order.STABLE_ORDER, getOutputs()));
692+
return Depset.of(Artifact.class, NestedSetBuilder.wrap(Order.STABLE_ORDER, getOutputs()));
693693
}
694694

695695
@Override

‎src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private static class DelegatingDefaultInfo extends DefaultInfo {
147147
@Nullable
148148
@Override
149149
public Depset getFiles() {
150-
return Depset.of(Artifact.TYPE, target.getProvider(FileProvider.class).getFilesToBuild());
150+
return Depset.of(Artifact.class, target.getProvider(FileProvider.class).getFilesToBuild());
151151
}
152152

153153
@Nullable

‎src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public boolean isImmutable() {
6060
*/
6161
@Override
6262
public Depset /*<Artifact>*/ getFilesToBuildForStarlark() {
63-
return Depset.of(Artifact.TYPE, filesToBuild);
63+
return Depset.of(Artifact.class, filesToBuild);
6464
}
6565

6666
public NestedSet<Artifact> getFilesToBuild() {

‎src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public Object getIndex(StarlarkSemantics semantics, Object key) throws EvalExcep
287287

288288
NestedSet<Artifact> result = outputGroups.get(key);
289289
if (result != null) {
290-
return Depset.of(Artifact.TYPE, result);
290+
return Depset.of(Artifact.class, result);
291291
} else {
292292
throw Starlark.errorf("Output group %s not present", key);
293293
}
@@ -310,7 +310,7 @@ public Object getValue(String name) {
310310
if (result == null) {
311311
return null;
312312
}
313-
return Depset.of(Artifact.TYPE, result);
313+
return Depset.of(Artifact.class, result);
314314
}
315315

316316
@Override

‎src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ public Iterable<PathFragment> getExtraPaths(Set<PathFragment> manifestPaths) {
111111
//
112112
// Goodnight, prince(ss)?, and sweet dreams.
113113
public static final class SymlinkEntry implements SymlinkEntryApi {
114-
115-
static final Depset.ElementType TYPE = Depset.ElementType.of(SymlinkEntry.class);
116-
117114
private final PathFragment path;
118115
private final Artifact artifact;
119116

@@ -270,7 +267,7 @@ public NestedSet<Artifact> getExtraMiddlemen() {
270267
/** Returns the collection of runfiles as artifacts. */
271268
@Override
272269
public Depset /*<Artifact>*/ getArtifactsForStarlark() {
273-
return Depset.of(Artifact.TYPE, artifacts);
270+
return Depset.of(Artifact.class, artifacts);
274271
}
275272

276273
public NestedSet<Artifact> getArtifacts() {
@@ -280,7 +277,7 @@ public NestedSet<Artifact> getArtifacts() {
280277
/** Returns the symlinks. */
281278
@Override
282279
public Depset /*<SymlinkEntry>*/ getSymlinksForStarlark() {
283-
return Depset.of(SymlinkEntry.TYPE, symlinks);
280+
return Depset.of(SymlinkEntry.class, symlinks);
284281
}
285282

286283
public NestedSet<SymlinkEntry> getSymlinks() {
@@ -289,7 +286,7 @@ public NestedSet<SymlinkEntry> getSymlinks() {
289286

290287
@Override
291288
public Depset /*<String>*/ getEmptyFilenamesForStarlark() {
292-
return Depset.of(Depset.ElementType.STRING, getEmptyFilenames());
289+
return Depset.of(String.class, getEmptyFilenames());
293290
}
294291

295292
public NestedSet<String> getEmptyFilenames() {
@@ -512,7 +509,7 @@ private static boolean isUnderWorkspace(PathFragment path) {
512509
/** Returns the root symlinks. */
513510
@Override
514511
public Depset /*<SymlinkEntry>*/ getRootSymlinksForStarlark() {
515-
return Depset.of(SymlinkEntry.TYPE, rootSymlinks);
512+
return Depset.of(SymlinkEntry.class, rootSymlinks);
516513
}
517514

518515
public NestedSet<SymlinkEntry> getRootSymlinks() {

‎src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ public Tuple resolveTools(Sequence<?> tools) throws EvalException {
11201120
.addToolDependencies(Sequence.cast(tools, TransitiveInfoCollection.class, "tools"))
11211121
.build();
11221122
return Tuple.pair(
1123-
Depset.of(Artifact.TYPE, helper.getResolvedTools()), helper.getToolsRunfilesSuppliers());
1123+
Depset.of(Artifact.class, helper.getResolvedTools()), helper.getToolsRunfilesSuppliers());
11241124
}
11251125

11261126
public StarlarkSemantics getStarlarkSemantics() {

‎src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailure.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,13 @@
1515
package com.google.devtools.build.lib.analysis.test;
1616

1717
import com.google.devtools.build.lib.cmdline.Label;
18-
import com.google.devtools.build.lib.collect.nestedset.Depset;
1918
import com.google.devtools.build.lib.starlarkbuildapi.test.AnalysisFailureApi;
2019
import net.starlark.java.eval.Printer;
2120

2221
/**
2322
* Encapsulates information about an analysis-phase error which would have occurred during a build.
2423
*/
2524
public class AnalysisFailure implements AnalysisFailureApi {
26-
27-
/** The Starlark type symbol for AnalysisFailure values. */
28-
public static final Depset.ElementType TYPE = Depset.ElementType.of(AnalysisFailure.class);
29-
3025
private final Label label;
3126
private final String message;
3227

‎src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisFailureInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static AnalysisFailureInfo forAnalysisFailureSets(
6767

6868
@Override
6969
public Depset /*<AnalysisFailure>*/ getCauses() {
70-
return Depset.of(AnalysisFailure.TYPE, causes);
70+
return Depset.of(AnalysisFailure.class, causes);
7171
}
7272

7373
public NestedSet<AnalysisFailure> getCausesNestedSet() {

‎src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public NestedSet<Artifact> getInstrumentedFiles() {
7777

7878
@Override
7979
public Depset getInstrumentedFilesForStarlark() {
80-
return Depset.of(Artifact.TYPE, getInstrumentedFiles());
80+
return Depset.of(Artifact.class, getInstrumentedFiles());
8181
}
8282

8383
/** Returns a collection of instrumentation metadata files. */
@@ -87,7 +87,7 @@ public NestedSet<Artifact> getInstrumentationMetadataFiles() {
8787

8888
@Override
8989
public Depset getInstrumentationMetadataFilesForStarlark() {
90-
return Depset.of(Artifact.TYPE, getInstrumentationMetadataFiles());
90+
return Depset.of(Artifact.class, getInstrumentationMetadataFiles());
9191
}
9292

9393
/**

‎src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public Object getValue(String name) {
168168
// A shortcut for files to build in Starlark. FileConfiguredTarget and RuleConfiguredTarget
169169
// always has FileProvider and Error- and PackageGroupConfiguredTarget-s shouldn't be
170170
// accessible in Starlark.
171-
return Depset.of(Artifact.TYPE, getProvider(FileProvider.class).getFilesToBuild());
171+
return Depset.of(Artifact.class, getProvider(FileProvider.class).getFilesToBuild());
172172
}
173173
return actual.getValue(name);
174174
}

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidAssetsInfo.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public Artifact getValidationResult() {
114114

115115
@Override
116116
public Depset /*<ParsedAndroidAssets>*/ getDirectParsedAssetsForStarlark() {
117-
return Depset.of(ParsedAndroidAssets.TYPE, directParsedAssets);
117+
return Depset.of(ParsedAndroidAssets.class, directParsedAssets);
118118
}
119119

120120
public NestedSet<ParsedAndroidAssets> getDirectParsedAssets() {
@@ -135,7 +135,7 @@ public String getLocalAssetDir() {
135135

136136
@Override
137137
public Depset /*<ParsedAndroidAssets>*/ getTransitiveParsedAssetsForStarlark() {
138-
return Depset.of(ParsedAndroidAssets.TYPE, transitiveParsedAssets);
138+
return Depset.of(ParsedAndroidAssets.class, transitiveParsedAssets);
139139
}
140140

141141
public NestedSet<ParsedAndroidAssets> getTransitiveParsedAssets() {
@@ -144,7 +144,7 @@ public NestedSet<ParsedAndroidAssets> getTransitiveParsedAssets() {
144144

145145
@Override
146146
public Depset /*<Artifact>*/ getAssetsForStarlark() {
147-
return Depset.of(Artifact.TYPE, transitiveAssets);
147+
return Depset.of(Artifact.class, transitiveAssets);
148148
}
149149

150150
public NestedSet<Artifact> getAssets() {
@@ -153,7 +153,7 @@ public NestedSet<Artifact> getAssets() {
153153

154154
@Override
155155
public Depset /*<Artifact>*/ getSymbolsForStarlark() {
156-
return Depset.of(Artifact.TYPE, transitiveSymbols);
156+
return Depset.of(Artifact.class, transitiveSymbols);
157157
}
158158

159159
public NestedSet<Artifact> getSymbols() {
@@ -168,7 +168,7 @@ private Optional<ParsedAndroidAssets> getLocalParsedAndroidAssets() {
168168

169169
@Override
170170
public Depset /*<Artifact>*/ getCompiledSymbolsForStarlark() {
171-
return Depset.of(Artifact.TYPE, transitiveCompiledSymbols);
171+
return Depset.of(Artifact.class, transitiveCompiledSymbols);
172172
}
173173

174174
NestedSet<Artifact> getCompiledSymbols() {

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryNativeLibsInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public Dict<String, Depset> getNativeLibsStarlark() {
5757
return null;
5858
}
5959
return Dict.immutableCopyOf(
60-
Maps.transformValues(nativeLibs.getMap(), set -> Depset.of(Artifact.TYPE, set)));
60+
Maps.transformValues(nativeLibs.getMap(), set -> Depset.of(Artifact.class, set)));
6161
}
6262

6363
@Nullable
@@ -75,7 +75,7 @@ public Depset getTransitiveNativeLibsStarlark() {
7575
if (transitiveNativeLibs == null) {
7676
return null;
7777
}
78-
return Depset.of(Artifact.TYPE, transitiveNativeLibs);
78+
return Depset.of(Artifact.class, transitiveNativeLibs);
7979
}
8080

8181
@Nullable

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdeInfoProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public ImmutableMap<String, NestedSet<Artifact>> getNativeLibs() {
324324
public ImmutableMap<String, Depset> getNativeLibsStarlark() {
325325
ImmutableMap.Builder<String, Depset> builder = ImmutableMap.builder();
326326
for (Map.Entry<String, NestedSet<Artifact>> entry : getNativeLibs().entrySet()) {
327-
builder.put(entry.getKey(), Depset.of(Artifact.TYPE, entry.getValue()));
327+
builder.put(entry.getKey(), Depset.of(Artifact.class, entry.getValue()));
328328
}
329329
return builder.buildOrThrow();
330330
}

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Provider getProvider() {
5656

5757
@Override
5858
public Depset /*<String>*/ getTransitiveIdlImportRootsForStarlark() {
59-
return Depset.of(Depset.ElementType.STRING, transitiveIdlImportRoots);
59+
return Depset.of(String.class, transitiveIdlImportRoots);
6060
}
6161

6262
NestedSet<String> getTransitiveIdlImportRoots() {
@@ -65,7 +65,7 @@ NestedSet<String> getTransitiveIdlImportRoots() {
6565

6666
@Override
6767
public Depset /*<Artifact>*/ getTransitiveIdlImportsForStarlark() {
68-
return Depset.of(Artifact.TYPE, transitiveIdlImports);
68+
return Depset.of(Artifact.class, transitiveIdlImports);
6969
}
7070

7171
NestedSet<Artifact> getTransitiveIdlImports() {
@@ -74,7 +74,7 @@ NestedSet<Artifact> getTransitiveIdlImports() {
7474

7575
@Override
7676
public Depset /*<Artifact>*/ getTransitiveIdlJarsForStarlark() {
77-
return Depset.of(Artifact.TYPE, transitiveIdlJars);
77+
return Depset.of(Artifact.class, transitiveIdlJars);
7878
}
7979

8080
NestedSet<Artifact> getTransitiveIdlJars() {
@@ -83,7 +83,7 @@ NestedSet<Artifact> getTransitiveIdlJars() {
8383

8484
@Override
8585
public Depset /*<Artifact>*/ getTransitiveIdlPreprocessedForStarlark() {
86-
return Depset.of(Artifact.TYPE, transitiveIdlPreprocessed);
86+
return Depset.of(Artifact.class, transitiveIdlPreprocessed);
8787
}
8888

8989
NestedSet<Artifact> getTransitiveIdlPreprocessed() {

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryAarInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public NestedSet<Aar> getTransitiveAars() {
8585

8686
@Override
8787
public Depset /*<Artifact>*/ getTransitiveAarArtifactsForStarlark() {
88-
return Depset.of(Artifact.TYPE, transitiveAarArtifacts);
88+
return Depset.of(Artifact.class, transitiveAarArtifacts);
8989
}
9090

9191
public NestedSet<Artifact> getTransitiveAarArtifacts() {

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryResourceClassJarProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static AndroidLibraryResourceClassJarProvider create(
5757

5858
@Override
5959
public Depset /*<Artifact>*/ getResourceClassJarsForStarlark() {
60-
return Depset.of(Artifact.TYPE, resourceClassJars);
60+
return Depset.of(Artifact.class, resourceClassJars);
6161
}
6262

6363
public NestedSet<Artifact> getResourceClassJars() {

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidNativeLibsInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public AndroidNativeLibsInfoProvider getProvider() {
4747

4848
@Override
4949
public Depset /*<Artifact>*/ getNativeLibsForStarlark() {
50-
return Depset.of(Artifact.TYPE, nativeLibs);
50+
return Depset.of(Artifact.class, nativeLibs);
5151
}
5252

5353
NestedSet<Artifact> getNativeLibs() {

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidNeverLinkLibrariesProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public NestedSet<Artifact> getTransitiveNeverLinkLibraries() {
6161

6262
@Override
6363
public Depset /*<Artifact>*/ getTransitiveNeverLinkLibrariesForStarlark() {
64-
return Depset.of(Artifact.TYPE, transitiveNeverLinkLibraries);
64+
return Depset.of(Artifact.class, transitiveNeverLinkLibraries);
6565
}
6666

6767
/** Provider class for {@link AndroidNeverLinkLibrariesProvider} objects. */

‎src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesInfo.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public Artifact getRTxt() {
116116

117117
@Override
118118
public Depset /*<ValidatedAndroidResources>*/ getTransitiveAndroidResourcesForStarlark() {
119-
return Depset.of(ValidatedAndroidResources.TYPE, transitiveAndroidResources);
119+
return Depset.of(ValidatedAndroidResources.class, transitiveAndroidResources);
120120
}
121121

122122
public NestedSet<ValidatedAndroidResources> getTransitiveAndroidResources() {
@@ -125,7 +125,7 @@ public NestedSet<ValidatedAndroidResources> getTransitiveAndroidResources() {
125125

126126
@Override
127127
public Depset /*<ValidatedAndroidResources>*/ getDirectAndroidResourcesForStarlark() {
128-
return Depset.of(ValidatedAndroidResources.TYPE, directAndroidResources);
128+
return Depset.of(ValidatedAndroidResources.class, directAndroidResources);
129129
}
130130

131131
public NestedSet<ValidatedAndroidResources> getDirectAndroidResources() {
@@ -134,7 +134,7 @@ public NestedSet<ValidatedAndroidResources> getDirectAndroidResources() {
134134

135135
@Override
136136
public Depset /*<Artifact>*/ getTransitiveResourcesForStarlark() {
137-
return Depset.of(Artifact.TYPE, transitiveResources);
137+
return Depset.of(Artifact.class, transitiveResources);
138138
}
139139

140140
public NestedSet<Artifact> getTransitiveResources() {
@@ -143,7 +143,7 @@ public NestedSet<Artifact> getTransitiveResources() {
143143

144144
@Override
145145
public Depset /*<Artifact>*/ getTransitiveManifestsForStarlark() {
146-
return Depset.of(Artifact.TYPE, transitiveManifests);
146+
return Depset.of(Artifact.class, transitiveManifests);
147147
}
148148

149149
public NestedSet<Artifact> getTransitiveManifests() {
@@ -152,7 +152,7 @@ public NestedSet<Artifact> getTransitiveManifests() {
152152

153153
@Override
154154
public Depset /*<Artifact>*/ getTransitiveAapt2RTxtForStarlark() {
155-
return Depset.of(Artifact.TYPE, transitiveAapt2RTxt);
155+
return Depset.of(Artifact.class, transitiveAapt2RTxt);
156156
}
157157

158158
public NestedSet<Artifact> getTransitiveAapt2RTxt() {
@@ -161,7 +161,7 @@ public NestedSet<Artifact> getTransitiveAapt2RTxt() {
161161

162162
@Override
163163
public Depset /*<Artifact>*/ getTransitiveAapt2ValidationArtifactsForStarlark() {
164-
return Depset.of(Artifact.TYPE, transitiveAapt2ValidationArtifacts);
164+
return Depset.of(Artifact.class, transitiveAapt2ValidationArtifacts);
165165
}
166166

167167
NestedSet<Artifact> getTransitiveAapt2ValidationArtifacts() {
@@ -170,7 +170,7 @@ NestedSet<Artifact> getTransitiveAapt2ValidationArtifacts() {
170170

171171
@Override
172172
public Depset /*<Artifact>*/ getTransitiveSymbolsBinForStarlark() {
173-
return Depset.of(Artifact.TYPE, transitiveSymbolsBin);
173+
return Depset.of(Artifact.class, transitiveSymbolsBin);
174174
}
175175

176176
public NestedSet<Artifact> getTransitiveSymbolsBin() {
@@ -179,7 +179,7 @@ public NestedSet<Artifact> getTransitiveSymbolsBin() {
179179

180180
@Override
181181
public Depset /*<Artifact>*/ getTransitiveCompiledSymbolsForStarlark() {
182-
return Depset.of(Artifact.TYPE, transitiveCompiledSymbols);
182+
return Depset.of(Artifact.class, transitiveCompiledSymbols);
183183
}
184184

185185
NestedSet<Artifact> getTransitiveCompiledSymbols() {
@@ -188,7 +188,7 @@ NestedSet<Artifact> getTransitiveCompiledSymbols() {
188188

189189
@Override
190190
public Depset /*<Artifact>*/ getTransitiveStaticLibForStarlark() {
191-
return Depset.of(Artifact.TYPE, transitiveStaticLib);
191+
return Depset.of(Artifact.class, transitiveStaticLib);
192192
}
193193

194194
NestedSet<Artifact> getTransitiveStaticLib() {
@@ -197,7 +197,7 @@ NestedSet<Artifact> getTransitiveStaticLib() {
197197

198198
@Override
199199
public Depset /*<Artifact>*/ getTransitiveRTxtForStarlark() {
200-
return Depset.of(Artifact.TYPE, transitiveRTxt);
200+
return Depset.of(Artifact.class, transitiveRTxt);
201201
}
202202

203203
NestedSet<Artifact> getTransitiveRTxt() {

0 commit comments

Comments
 (0)