From 4f119ac68b7d6f20ec8b7bc02dc715a1463d5d60 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Wed, 13 Jul 2016 17:53:08 +0000
Subject: Omit redundant string formatting

--
MOS_MIGRATED_REVID=127334955
---
 .../build/lib/analysis/actions/CustomCommandLine.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
index eb51c0797a..af15057410 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java
@@ -382,14 +382,16 @@ public final class CustomCommandLine extends CommandLine {
     public Builder add(String arg, Iterable<String> args) {
       if (arg != null && args != null) {
         arguments.add(arg);
-        arguments.add(InterspersingArgs.fromStrings(args, /*beforeEach=*/null, "%s"));
+        arguments.add(
+            InterspersingArgs.fromStrings(args, /*beforeEach=*/ null, /*formatEach=*/ null));
       }
       return this;
     }
 
     public Builder add(Iterable<String> args) {
       if (args != null) {
-        arguments.add(InterspersingArgs.fromStrings(args, /*beforeEach=*/null, "%s"));
+        arguments.add(
+            InterspersingArgs.fromStrings(args, /*beforeEach=*/ null, /*formatEach=*/ null));
       }
       return this;
     }
@@ -405,14 +407,16 @@ public final class CustomCommandLine extends CommandLine {
     public Builder addExecPaths(String arg, Iterable<Artifact> artifacts) {
       if (arg != null && artifacts != null) {
         arguments.add(arg);
-        arguments.add(InterspersingArgs.fromExecPaths(artifacts, /*beforeEach=*/null, "%s"));
+        arguments.add(
+            InterspersingArgs.fromExecPaths(artifacts, /*beforeEach=*/ null, /*formatEach=*/ null));
       }
       return this;
     }
 
     public Builder addExecPaths(Iterable<Artifact> artifacts) {
       if (artifacts != null) {
-        arguments.add(InterspersingArgs.fromExecPaths(artifacts, /*beforeEach=*/null, "%s"));
+        arguments.add(
+            InterspersingArgs.fromExecPaths(artifacts, /*beforeEach=*/ null, /*formatEach=*/ null));
       }
       return this;
     }
@@ -511,21 +515,21 @@ public final class CustomCommandLine extends CommandLine {
 
     public Builder addBeforeEachPath(String repeated, Iterable<PathFragment> paths) {
       if (repeated != null && paths != null) {
-        arguments.add(InterspersingArgs.fromStrings(paths, repeated, "%s"));
+        arguments.add(InterspersingArgs.fromStrings(paths, repeated, /*formatEach=*/ null));
       }
       return this;
     }
 
     public Builder addBeforeEach(String repeated, Iterable<String> strings) {
       if (repeated != null && strings != null) {
-        arguments.add(InterspersingArgs.fromStrings(strings, repeated, "%s"));
+        arguments.add(InterspersingArgs.fromStrings(strings, repeated, /*formatEach=*/ null));
       }
       return this;
     }
 
     public Builder addBeforeEachExecPath(String repeated, Iterable<Artifact> artifacts) {
       if (repeated != null && artifacts != null) {
-        arguments.add(InterspersingArgs.fromExecPaths(artifacts, repeated, "%s"));
+        arguments.add(InterspersingArgs.fromExecPaths(artifacts, repeated, /*formatEach=*/ null));
       }
       return this;
     }
-- 
cgit v1.2.3