From 1b18d65227c127fe946d3fcde4586158bc7e5fcb Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 5 Mar 2021 09:27:38 -0800 Subject: [PATCH] Automatic code cleanup. PiperOrigin-RevId: 361161895 --- .../lib/runtime/commands/info/BuildLanguageInfoItem.java | 3 +-- .../google/devtools/build/lib/worker/WorkerSpawnRunner.java | 6 +----- .../devtools/build/lib/bazel/execlog/StableSortTest.java | 2 +- .../lib/runtime/AllIncompatibleChangesExpansionTest.java | 6 +++--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/info/BuildLanguageInfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/info/BuildLanguageInfoItem.java index 98cf8cae19dcb5..8d3560e5c304f1 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/info/BuildLanguageInfoItem.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/info/BuildLanguageInfoItem.java @@ -119,8 +119,7 @@ private static AttributeValue convertAttrValue(Type t, Object v) { for (Map.Entry entry : ((Map) v).entrySet()) { b.addDictBuilder() .setKey(entry.getKey().toString()) - .setValue(convertAttrValue(dictType.getValueType(), entry.getValue())) - .build(); + .setValue(convertAttrValue(dictType.getValueType(), entry.getValue())); } } else if (v instanceof List) { for (Object elem : (List) v) { diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java index c95e7b33446fbc..1c43cbcab43ffe 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java @@ -299,11 +299,7 @@ private WorkRequest createWorkRequest( digest = ByteString.copyFromUtf8(HashCode.fromBytes(digestBytes).toString()); } - requestBuilder - .addInputsBuilder() - .setPath(input.getExecPathString()) - .setDigest(digest) - .build(); + requestBuilder.addInputsBuilder().setPath(input.getExecPathString()).setDigest(digest); } if (key.getProxied()) { requestBuilder.setRequestId(requestIdCounter.getAndIncrement()); diff --git a/src/test/java/com/google/devtools/build/lib/bazel/execlog/StableSortTest.java b/src/test/java/com/google/devtools/build/lib/bazel/execlog/StableSortTest.java index 9e711295bb335b..1e3f6ec50268f9 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/execlog/StableSortTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/execlog/StableSortTest.java @@ -70,7 +70,7 @@ private static SpawnExec.Builder createSpawnExecBuilder( List inputs, List outputs) { SpawnExec.Builder e = SpawnExec.newBuilder(); for (String output : outputs) { - e.addActualOutputsBuilder().setPath(output).build(); + e.addActualOutputsBuilder().setPath(output); e.addListedOutputs(output); } for (String s : inputs) { diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java index 13c3639ba083aa..1906f60c205b3a 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/AllIncompatibleChangesExpansionTest.java @@ -207,10 +207,10 @@ public void invocationPolicy() throws OptionsParsingException { // Check that all-expansion behaves just like any other expansion flag and can be filtered // by invocation policy. InvocationPolicy.Builder invocationPolicyBuilder = InvocationPolicy.newBuilder(); - invocationPolicyBuilder.addFlagPoliciesBuilder() + invocationPolicyBuilder + .addFlagPoliciesBuilder() .setFlagName("incompatible_A") - .setUseDefault(UseDefault.getDefaultInstance()) - .build(); + .setUseDefault(UseDefault.getDefaultInstance()); InvocationPolicy policy = invocationPolicyBuilder.build(); InvocationPolicyEnforcer enforcer = new InvocationPolicyEnforcer(policy);