Don't force PrintStream on streaming output formatters

Usually an OutputStream will do. Forgo the extra layer of indirection and
stream directly to the output.

--
MOS_MIGRATED_REVID=134682243

1 files changed, 1 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
index 849238a44a..3620b8fbda 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
@@ -81,7 +81,6 @@ import com.google.devtools.common.options.OptionsParsingException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintStream;
 import java.nio.channels.ClosedByInterruptException;
 import java.util.Collection;
 import java.util.HashSet;
@@ -309,18 +308,15 @@ public class GenQuery implements RuleConfiguredTargetFactory {
     }
 
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    PrintStream printStream = new PrintStream(outputStream);
-
     try {
       QueryOutputUtils
-          .output(queryOptions, queryResult, targets.getResult(), formatter, printStream,
+          .output(queryOptions, queryResult, targets.getResult(), formatter, outputStream,
           queryOptions.aspectDeps.createResolver(packageProvider, getEventHandler(ruleContext)));
     } catch (ClosedByInterruptException e) {
       throw new InterruptedException(e.getMessage());
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
-    printStream.flush();
 
     return outputStream.toByteArray();
   }