Remove BlockIndentStyle::Inherit

[rust.git] / src / filemap.rs

diff --git a/src/filemap.rs b/src/filemap.rs
index c6af9a7018486b15e0563773cab147a2946566ef..6c15d659d549eda0f805937baf712f75ee3fce51 100644 (file)
--- a/src/filemap.rs
+++ b/src/filemap.rs
@@ -13,37 +13,35 @@
 
 use strings::string_buffer::StringBuffer;
 
-use std::collections::HashMap;
 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};
 use checkstyle::{output_header, output_footer, output_checkstyle_file};
 
 // A map of the files of a crate, with their new content
-pub type FileMap = HashMap<String, StringBuffer>;
+pub type FileMap = Vec<FileRecord>;
+
+pub type FileRecord = (String, StringBuffer);
 
 // Append a newline to the end of each file.
-pub fn append_newlines(file_map: &mut FileMap) {
-    for (_, s) in file_map.iter_mut() {
-        s.push_str("\n");
-    }
+pub fn append_newline(s: &mut StringBuffer) {
+    s.push_str("\n");
 }
 
 pub fn write_all_files<T>(file_map: &FileMap, out: &mut T, config: &Config) -> Result<(), io::Error>
     where T: Write
 {
     output_header(out, config.write_mode).ok();
-    for filename in file_map.keys() {
-        try!(write_file(&file_map[filename], filename, out, config));
+    for &(ref filename, ref text) in file_map {
+        try!(write_file(text, filename, out, config));
     }
     output_footer(out, config.write_mode).ok();
 
     Ok(())
 }
 
-
 // Prints all newlines either as `\n` or as `\r\n`.
 pub fn write_system_newlines<T>(writer: T,
                                 text: &StringBuffer,
@@ -80,11 +78,11 @@ pub fn write_system_newlines<T>(writer: T,
     }
 }
 
-fn write_file<T>(text: &StringBuffer,
-                 filename: &str,
-                 out: &mut T,
-                 config: &Config)
-                 -> Result<Option<String>, io::Error>
+pub fn write_file<T>(text: &StringBuffer,
+                     filename: &str,
+                     out: &mut T,
+                     config: &Config)
+                     -> Result<bool, io::Error>
     where T: Write
 {
 
@@ -135,21 +133,19 @@ 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) {
-                print_diff(make_diff(&ori, &fmt, 3),
-                           |line_num| format!("\nDiff at line {}:", line_num));
+                let mismatch = make_diff(&ori, &fmt, 3);
+                let has_diff = !mismatch.is_empty();
+                print_diff(mismatch,
+                           |line_num| format!("Diff in {} at line {}:", filename, line_num));
+                return Ok(has_diff);
             }
         }
         WriteMode::Checkstyle => {
@@ -158,5 +154,6 @@ fn create_diff(filename: &str,
         }
     }
 
-    Ok(None)
+    // when we are not in diff mode, don't indicate differing files
+    Ok(false)
 }