Remove BlockIndentStyle::Inherit

[rust.git] / src / filemap.rs

diff --git a/src/filemap.rs b/src/filemap.rs
index 1fca0d5b0125214961b4ae8ba80fb6691c5056b3..6c15d659d549eda0f805937baf712f75ee3fce51 100644 (file)
--- 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, BufWriter};
 
 use config::{NewlineStyle, Config, WriteMode};
 use rustfmt_diff::{make_diff, print_diff, Mismatch};
@@ -133,22 +133,18 @@ 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 => {
-            println!("Diff of {}:\n", filename);
             if let Ok((ori, fmt)) = source_and_formatted_text(text, filename, config) {
                 let mismatch = make_diff(&ori, &fmt, 3);
                 let has_diff = !mismatch.is_empty();
-                print_diff(mismatch, |line_num| format!("\nDiff at line {}:", line_num));
+                print_diff(mismatch,
+                           |line_num| format!("Diff in {} at line {}:", filename, line_num));
                 return Ok(has_diff);
             }
         }