Remove use of bare Immutable{List,Map,Set} Builder classes.
Always use the more-qualified class name for clarity at the site of use. There are too many classes named Builder.
PiperOrigin-RevId: 193624381
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index ac2c429..251c64a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -21,7 +21,6 @@
import com.google.common.base.Preconditions;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -1479,7 +1478,7 @@
Artifact ltoIndexingFile,
ImmutableMap<String, String> additionalBuildVariables) {
Artifact sourceFile = builder.getSourceFile();
- Builder<String> userCompileFlags = ImmutableList.builder();
+ ImmutableList.Builder<String> userCompileFlags = ImmutableList.builder();
userCompileFlags.addAll(getCoptsFromOptions(cppConfiguration, sourceFile.getExecPathString()));
userCompileFlags.addAll(copts);
if (sourceFile != null && sourceLabel != null) {
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 1b08e17..c9402b0 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
@@ -18,7 +18,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.analysis.config.CompilationMode;
@@ -238,7 +237,7 @@
}
@Override
- public void addGlobalMakeVariables(Builder<String, String> globalMakeEnvBuilder) {
+ public void addGlobalMakeVariables(ImmutableMap.Builder<String, String> globalMakeEnvBuilder) {
globalMakeEnvBuilder.putAll(
getCppBuildVariables(
this::getToolPathFragment,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index 9a17da9..5563ae2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -21,7 +21,6 @@
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.collect.ListMultimap;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Options.MakeVariableSource;
@@ -1280,7 +1279,7 @@
}
@Override
- public void addGlobalMakeVariables(Builder<String, String> globalMakeEnvBuilder) {
+ public void addGlobalMakeVariables(ImmutableMap.Builder<String, String> globalMakeEnvBuilder) {
if (!cppOptions.enableMakeVariables) {
return;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
index 02a57e0..b34dbb6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
@@ -22,7 +22,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionOwner;
@@ -1195,7 +1194,7 @@
private Iterable<Artifact> getArtifactsPossiblyLtoMapped(
Iterable<LinkerInput> inputs, Map<Artifact, Artifact> ltoMapping) {
Preconditions.checkNotNull(ltoMapping);
- Builder<Artifact> result = ImmutableSet.builder();
+ ImmutableSet.Builder<Artifact> result = ImmutableSet.builder();
Iterable<Artifact> artifacts = LinkerInputs.toLibraryArtifacts(inputs);
for (Artifact a : artifacts) {
Artifact renamed = ltoMapping.get(a);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java
index dbaa75e..0d1db91 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java
@@ -16,7 +16,6 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.RuleContext;
@@ -91,7 +90,7 @@
boolean codeCoverageEnabled) {
String labelPattern = Pattern.quote("${LABEL}");
String outputPathPattern = Pattern.quote("${OUTPUT_PATH}");
- Builder<String> defines =
+ ImmutableList.Builder<String> defines =
ImmutableList.<String>builder()
.add("GPLATFORM=\"" + cppConfiguration + "\"")
.add("BUILD_COVERAGE_ENABLED=" + (codeCoverageEnabled ? "1" : "0"))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java
index dc5415f..4994bee 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LibrariesToLinkCollector.java
@@ -17,7 +17,6 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
@@ -154,9 +153,9 @@
* <p>TODO: Factor out of the bazel binary into build variables for crosstool action_configs.
*/
public CollectedLibrariesToLink collectLibrariesToLink() {
- Builder<String> librarySearchDirectories = ImmutableSet.builder();
- Builder<String> runtimeLibrarySearchDirectories = ImmutableSet.builder();
- Builder<String> rpathRootsForExplicitSoDeps = ImmutableSet.builder();
+ ImmutableSet.Builder<String> librarySearchDirectories = ImmutableSet.builder();
+ ImmutableSet.Builder<String> runtimeLibrarySearchDirectories = ImmutableSet.builder();
+ ImmutableSet.Builder<String> rpathRootsForExplicitSoDeps = ImmutableSet.builder();
// List of command line parameters that need to be placed *outside* of
// --whole-archive ... --no-whole-archive.
SequenceBuilder librariesToLink = new SequenceBuilder();
@@ -201,7 +200,7 @@
Preconditions.checkState(
ltoMap == null || ltoMap.isEmpty(), "Still have LTO objects left: %s", ltoMap);
- Builder<String> allRuntimeLibrarySearchDirectories = ImmutableSet.builder();
+ ImmutableSet.Builder<String> allRuntimeLibrarySearchDirectories = ImmutableSet.builder();
// rpath ordering matters for performance; first add the one where most libraries are found.
if (includeSolibDir) {
allRuntimeLibrarySearchDirectories.add(rpathRoot);
@@ -218,8 +217,8 @@
}
private boolean addLinkerInputs(
- Builder<String> librarySearchDirectories,
- Builder<String> rpathEntries,
+ ImmutableSet.Builder<String> librarySearchDirectories,
+ ImmutableSet.Builder<String> rpathEntries,
SequenceBuilder librariesToLink) {
boolean includeSolibDir = false;
for (LinkerInput input : linkerInputs) {
@@ -254,8 +253,8 @@
private void addDynamicInputLinkOptions(
LinkerInput input,
SequenceBuilder librariesToLink,
- Builder<String> librarySearchDirectories,
- Builder<String> rpathRootsForExplicitSoDeps) {
+ ImmutableSet.Builder<String> librarySearchDirectories,
+ ImmutableSet.Builder<String> rpathRootsForExplicitSoDeps) {
Preconditions.checkState(
input.getArtifactCategory() == ArtifactCategory.DYNAMIC_LIBRARY
|| input.getArtifactCategory() == ArtifactCategory.INTERFACE_LIBRARY);
@@ -410,8 +409,8 @@
}
private boolean addRuntimeLinkerInputs(
- Builder<String> librarySearchDirectories,
- Builder<String> rpathRootsForExplicitSoDeps,
+ ImmutableSet.Builder<String> librarySearchDirectories,
+ ImmutableSet.Builder<String> rpathRootsForExplicitSoDeps,
SequenceBuilder librariesToLink) {
boolean includeRuntimeSolibDir = false;
for (LinkerInput input : runtimeLinkerInputs) {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/GlobCriteria.java b/src/main/java/com/google/devtools/build/lib/syntax/GlobCriteria.java
index 9ef2f1b..2cf0dc2 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/GlobCriteria.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/GlobCriteria.java
@@ -20,7 +20,6 @@
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Iterables;
import java.util.List;
import java.util.stream.Stream;
@@ -202,7 +201,7 @@
return ImmutableList.of();
}
Iterable<String> split = Splitter.on(", ").split(text);
- Builder<String> listBuilder = ImmutableList.builder();
+ ImmutableList.Builder<String> listBuilder = ImmutableList.builder();
for (String element : split) {
if (!element.isEmpty()) {
if ((element.length() < 2) || !element.startsWith("'") || !element.endsWith("'")) {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/GlobList.java b/src/main/java/com/google/devtools/build/lib/syntax/GlobList.java
index 89abe08..5d03c0d 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/GlobList.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/GlobList.java
@@ -19,7 +19,6 @@
import com.google.common.base.Splitter;
import com.google.common.collect.ForwardingList;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
@@ -81,7 +80,7 @@
public static <T> GlobList<T> concat(
List<? extends T> list1, List<? extends T> list2) {
// we add the list to both includes and matches, preserving order
- Builder<GlobCriteria> criteriaBuilder = ImmutableList.builder();
+ ImmutableList.Builder<GlobCriteria> criteriaBuilder = ImmutableList.builder();
if (list1 instanceof GlobList<?>) {
criteriaBuilder.addAll(((GlobList<?>) list1).criteria);
} else {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java
index 4164369..c3deea0 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkCallbackFunction.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.lib.syntax;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
import com.google.devtools.build.lib.events.EventHandler;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
@@ -57,7 +56,7 @@
*/
private ImmutableList<Object> buildArgumentList(ClassObject ctx, Object... arguments)
throws EvalException {
- Builder<Object> builder = ImmutableList.builder();
+ ImmutableList.Builder<Object> builder = ImmutableList.builder();
ImmutableList<String> names = getParameterNames();
int requiredParameters = names.size() - arguments.length;
for (int pos = 0; pos < requiredParameters; ++pos) {
