Automatic code cleanup.
PiperOrigin-RevId: 425500819
diff --git a/src/main/java/com/google/devtools/build/docgen/DocgenConsts.java b/src/main/java/com/google/devtools/build/docgen/DocgenConsts.java
index e3c5411..652ae64 100644
--- a/src/main/java/com/google/devtools/build/docgen/DocgenConsts.java
+++ b/src/main/java/com/google/devtools/build/docgen/DocgenConsts.java
@@ -160,19 +160,19 @@
/** e.g. "[DEPRECATED]" in <!-- #BLAZE_RULE(...).ATTRIBUTE(...)[DEPRECATED] --> */
public static final Pattern BLAZE_RULE_FLAGS = Pattern.compile("^.*\\[(.*)\\].*$");
- public static final ImmutableMap<String, Integer> ATTRIBUTE_ORDERING = ImmutableMap
- .<String, Integer>builder()
- .put("name", -99)
- .put("deps", -98)
- .put("src", -97)
- .put("srcs", -96)
- .put("data", -95)
- .put("resource", -94)
- .put("resources", -93)
- .put("out", -92)
- .put("outs", -91)
- .put("hdrs", -90)
- .build();
+ public static final ImmutableMap<String, Integer> ATTRIBUTE_ORDERING =
+ ImmutableMap.<String, Integer>builder()
+ .put("name", -99)
+ .put("deps", -98)
+ .put("src", -97)
+ .put("srcs", -96)
+ .put("data", -95)
+ .put("resource", -94)
+ .put("resources", -93)
+ .put("out", -92)
+ .put("outs", -91)
+ .put("hdrs", -90)
+ .buildOrThrow();
// The following variables are not constants as they can be overridden from
// StarlarkDocumentationProcessor#parseOptions
diff --git a/src/main/java/com/google/devtools/build/docgen/PredefinedAttributes.java b/src/main/java/com/google/devtools/build/docgen/PredefinedAttributes.java
index 81fcdbd..68fc8cf 100644
--- a/src/main/java/com/google/devtools/build/docgen/PredefinedAttributes.java
+++ b/src/main/java/com/google/devtools/build/docgen/PredefinedAttributes.java
@@ -97,7 +97,7 @@
throw new IllegalStateException("Exception while reading " + filename, e);
}
}
- return builder.build();
+ return builder.buildOrThrow();
}
public static final ImmutableMap<String, RuleDocumentationAttribute> TYPICAL_ATTRIBUTES =
diff --git a/src/main/java/com/google/devtools/build/docgen/RuleDocumentationAttribute.java b/src/main/java/com/google/devtools/build/docgen/RuleDocumentationAttribute.java
index bdde055..17194dd 100644
--- a/src/main/java/com/google/devtools/build/docgen/RuleDocumentationAttribute.java
+++ b/src/main/java/com/google/devtools/build/docgen/RuleDocumentationAttribute.java
@@ -59,7 +59,7 @@
.put(BuildType.OUTPUT, "<a href=\"../build-ref.html#filename\">Filename</a>")
.put(
BuildType.OUTPUT_LIST, "List of <a href=\"../build-ref.html#filename\">filenames</a>")
- .build();
+ .buildOrThrow();
private final Class<? extends RuleDefinition> definitionClass;
private final String attributeName;
diff --git a/src/main/java/com/google/devtools/build/docgen/RuleLinkExpander.java b/src/main/java/com/google/devtools/build/docgen/RuleLinkExpander.java
index b0e5f46..aacfe55 100644
--- a/src/main/java/com/google/devtools/build/docgen/RuleLinkExpander.java
+++ b/src/main/java/com/google/devtools/build/docgen/RuleLinkExpander.java
@@ -45,7 +45,7 @@
.put("exports_files", FUNCTIONS_PAGE)
.put("glob", FUNCTIONS_PAGE)
.put("select", FUNCTIONS_PAGE)
- .build();
+ .buildOrThrow();
private final String productName;
private final Map<String, String> ruleIndex = new HashMap<>();
diff --git a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
index c5ed2a2..2dd8863 100644
--- a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
+++ b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
@@ -103,7 +103,7 @@
return ImmutableMap.<String, Object>builder()
.put("native", new FakeStarlarkNativeModuleApi())
.putAll(provider.getEnvironment())
- .build();
+ .buildOrThrow();
}
private ConfiguredRuleClassProvider createRuleClassProvider(String classProvider)
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
index 759d2fa..af9d8c0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
@@ -296,7 +296,7 @@
builder.put(module.name(), fragmentClass);
}
}
- return builder.build();
+ return builder.buildOrThrow();
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptionDetails.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptionDetails.java
index d0b2875..0c6729e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptionDetails.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptionDetails.java
@@ -86,7 +86,7 @@
throw new IllegalStateException(
"Unexpected illegal access trying to create this configuration's options map: ", e);
}
- return new BuildOptionDetails(map.build(), ImmutableMap.copyOf(starlarkOptions));
+ return new BuildOptionDetails(map.buildOrThrow(), ImmutableMap.copyOf(starlarkOptions));
}
private static final class OptionDetails {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index c54c037..81fc360 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -201,7 +201,8 @@
fragmentOptionsMap.entrySet()) {
nativeOptionsBuilder.put(entry.getKey(), entry.getValue().clone());
}
- return new BuildOptions(nativeOptionsBuilder.build(), ImmutableMap.copyOf(starlarkOptionsMap));
+ return new BuildOptions(
+ nativeOptionsBuilder.buildOrThrow(), ImmutableMap.copyOf(starlarkOptionsMap));
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptionConverters.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptionConverters.java
index 2b2ac09..de0092f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptionConverters.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptionConverters.java
@@ -59,7 +59,7 @@
.put(LABEL, new LabelConverter())
.put(LABEL_LIST, new LabelListConverter())
.put(NODEP_LABEL, new LabelConverter())
- .build();
+ .buildOrThrow();
/** A converter from strings to Starlark int values. */
private static class StarlarkIntConverter implements Converter<StarlarkInt> {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/StarlarkDefinedConfigTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/StarlarkDefinedConfigTransition.java
index 9c353bb..f45a493 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/StarlarkDefinedConfigTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/StarlarkDefinedConfigTransition.java
@@ -381,7 +381,7 @@
canonicalizeTransitionOutputDict(rawDict, repoMapping, parentLabel, getOutputs());
builder.put(entry.getKey(), canonicalizedDict);
}
- return builder.build();
+ return builder.buildOrThrow();
} catch (ValidationException ex) {
errorf(handler, "invalid result from transition function: %s", ex.getMessage());
return null;
@@ -423,7 +423,7 @@
errorf(handler, "invalid result from transition function: %s", ex.getMessage());
return null;
}
- return builder.build();
+ return builder.buildOrThrow();
} else {
errorf(
handler,
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java
index 9c449b9..5ddcf24 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/FunctionTransitionUtil.java
@@ -111,7 +111,7 @@
applyTransition(buildOptions, newValues, optionInfoMap, starlarkTransition);
splitBuildOptions.put(entry.getKey(), transitionedOptions);
}
- return splitBuildOptions.build();
+ return splitBuildOptions.buildOrThrow();
} catch (ValidationException ex) {
handler.handle(Event.error(starlarkTransition.getLocation(), ex.getMessage()));
@@ -148,7 +148,7 @@
? ImmutableMap.<String, Object>builder()
.putAll(originalOutput)
.put(COMMAND_LINE_OPTION_PREFIX + "platforms", ImmutableList.<Label>of())
- .build()
+ .buildOrThrow()
: originalOutput;
}
@@ -179,7 +179,7 @@
}
}
- return builder.build();
+ return builder.buildOrThrow();
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
index 4cfa2db..0ff531d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
@@ -367,10 +367,11 @@
private static final Map<Type<?>, String> whyNotConfigurable =
ImmutableMap.<Type<?>, String>builder()
- .put(BuildType.LICENSE,
+ .put(
+ BuildType.LICENSE,
"loading phase license checking logic assumes non-configurable values")
.put(BuildType.OUTPUT, "output paths are part of the static graph structure")
- .build();
+ .buildOrThrow();
/**
* If the given attribute type is non-configurable, returns the reason why. Otherwise, returns
@@ -755,6 +756,6 @@
b.put(key, value);
}
}
- return b.build();
+ return b.buildOrThrow();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
index 1a4b319..8663735 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttributesCollection.java
@@ -237,7 +237,7 @@
for (Map.Entry<String, Label> entry : ((Map<String, Label>) val).entrySet()) {
attrValue.put(entry.getKey(), prereqsByLabel.get(entry.getValue()));
}
- attrBuilder.put(skyname, attrValue.build());
+ attrBuilder.put(skyname, attrValue.buildOrThrow());
} else {
throw new IllegalArgumentException(
"Can't transform attribute "
@@ -256,7 +256,7 @@
executableBuilder,
fileBuilder,
filesBuilder,
- executableRunfilesbuilder.build());
+ executableRunfilesbuilder.buildOrThrow());
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java
index 937955e..3929612 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkLateBoundDefault.java
@@ -208,7 +208,7 @@
}
}
}
- return lateBoundDefaultMap.build();
+ return lateBoundDefaultMap.buildOrThrow();
});
/**
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 d6d9577..7660b86 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
@@ -494,7 +494,7 @@
}
return StructProvider.STRUCT.create(
- splitAttrInfos.build(),
+ splitAttrInfos.buildOrThrow(),
"No attribute '%s' in split_attr."
+ "This attribute is not defined with a split configuration.");
}
@@ -1113,6 +1113,6 @@
current.getProvider(FileProvider.class).getFilesToBuild().toList());
}
- return builder.build();
+ return builder.buildOrThrow();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java
index ebf8f7c..64a0de8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkTransition.java
@@ -296,7 +296,7 @@
aliasToActualBuilder.put(setting, rule.getLabel());
}
}
- ImmutableMap<Label, Label> aliasToActual = aliasToActualBuilder.build();
+ ImmutableMap<Label, Label> aliasToActual = aliasToActualBuilder.buildOrThrow();
// Verify changed settings were changed to something reasonable for their type and filter out
// default values.
@@ -378,7 +378,7 @@
cleanedOptionMap.put(entry.getKey(), options);
}
}
- return cleanedOptionMap.build();
+ return cleanedOptionMap.buildOrThrow();
}
/*
