From: Nick Cameron <ncameron@mozilla.com>
Date: Tue, 27 Sep 2016 04:24:58 +0000 (+1300)
Subject: Write to the supplied buffer if one is supplied to format_input
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=77ceba2bc033a230f77d6ac96a277191ca73fff2;p=rust.git

Write to the supplied buffer if one is supplied to format_input
---

diff --git a/src/filemap.rs b/src/filemap.rs
index 5560e9aee85..ea45defe55c 100644
--- a/src/filemap.rs
+++ b/src/filemap.rs
@@ -14,7 +14,7 @@
 use strings::string_buffer::StringBuffer;
 
 use std::fs::{self, File};
-use std::io::{self, Write, Read, stdout, BufWriter};
+use std::io::{self, Write, Read, sBufWriter};
 
 use config::{NewlineStyle, Config, WriteMode};
 use rustfmt_diff::{make_diff, print_diff, Mismatch};
@@ -133,15 +133,11 @@ fn create_diff(filename: &str,
             try!(write_system_newlines(file, text, config));
         }
         WriteMode::Plain => {
-            let stdout = stdout();
-            let stdout = stdout.lock();
-            try!(write_system_newlines(stdout, text, config));
+            try!(write_system_newlines(out, text, config));
         }
         WriteMode::Display | WriteMode::Coverage => {
             println!("{}:\n", filename);
-            let stdout = stdout();
-            let stdout = stdout.lock();
-            try!(write_system_newlines(stdout, text, config));
+            try!(write_system_newlines(out, text, config));
         }
         WriteMode::Diff => {
             if let Ok((ori, fmt)) = source_and_formatted_text(text, filename, config) {