// option. This file may not be copied, modified, or distributed
// except according to those terms.
-
// TODO: add tests
-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, BufWriter, Read, Write};
-use config::{NewlineStyle, Config, WriteMode};
+use checkstyle::{output_checkstyle_file, output_footer, output_header};
+use config::{Config, NewlineStyle, 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, String);
// 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 String) {
+ s.push_str("\n");
}
-pub fn write_all_files<T>(file_map: &FileMap, mut out: T, config: &Config) -> Result<(), io::Error>
- where T: Write
+pub fn write_all_files<T>(
+ file_map: &[FileRecord],
+ out: &mut T,
+ config: &Config,
+) -> Result<(), io::Error>
+where
+ T: Write,
{
- output_header(&mut out, config.write_mode).ok();
- for filename in file_map.keys() {
- try!(write_file(&file_map[filename], filename, &mut out, config));
+ output_header(out, config.write_mode()).ok();
+ for &(ref filename, ref text) in file_map {
+ write_file(text, filename, out, config)?;
}
- output_footer(&mut out, config.write_mode).ok();
+ 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,
- config: &Config)
- -> Result<(), io::Error>
- where T: Write
+pub fn write_system_newlines<T>(writer: T, text: &str, config: &Config) -> Result<(), io::Error>
+where
+ T: Write,
{
// Buffer output, since we're writing a since char at a time.
let mut writer = BufWriter::new(writer);
- let style = if config.newline_style == NewlineStyle::Native {
+ let style = if config.newline_style() == NewlineStyle::Native {
if cfg!(windows) {
NewlineStyle::Windows
} else {
NewlineStyle::Unix
}
} else {
- config.newline_style
+ config.newline_style()
};
match style {
NewlineStyle::Unix => write!(writer, "{}", text),
NewlineStyle::Windows => {
- for (c, _) in text.chars() {
+ for c in text.chars() {
match c {
- '\n' => try!(write!(writer, "\r\n")),
+ '\n' => write!(writer, "\r\n")?,
'\r' => continue,
- c => try!(write!(writer, "{}", c)),
+ c => write!(writer, "{}", c)?,
}
}
Ok(())
}
}
-pub fn write_file<T>(text: &StringBuffer,
- filename: &str,
- out: &mut T,
- config: &Config)
- -> Result<Option<String>, io::Error>
- where T: Write
+pub fn write_file<T>(
+ text: &str,
+ filename: &str,
+ out: &mut T,
+ config: &Config,
+) -> Result<bool, io::Error>
+where
+ T: Write,
{
-
- fn source_and_formatted_text(text: &StringBuffer,
- filename: &str,
- config: &Config)
- -> Result<(String, String), io::Error> {
- let mut f = try!(File::open(filename));
+ fn source_and_formatted_text(
+ text: &str,
+ filename: &str,
+ config: &Config,
+ ) -> Result<(String, String), io::Error> {
+ let mut f = File::open(filename)?;
let mut ori_text = String::new();
- try!(f.read_to_string(&mut ori_text));
+ f.read_to_string(&mut ori_text)?;
let mut v = Vec::new();
- try!(write_system_newlines(&mut v, text, config));
+ write_system_newlines(&mut v, text, config)?;
let fmt_text = String::from_utf8(v).unwrap();
Ok((ori_text, fmt_text))
}
- fn create_diff(filename: &str,
- text: &StringBuffer,
- config: &Config)
- -> Result<Vec<Mismatch>, io::Error> {
- let (ori, fmt) = try!(source_and_formatted_text(text, filename, config));
+ fn create_diff(
+ filename: &str,
+ text: &str,
+ config: &Config,
+ ) -> Result<Vec<Mismatch>, io::Error> {
+ let (ori, fmt) = source_and_formatted_text(text, filename, config)?;
Ok(make_diff(&ori, &fmt, 3))
}
- match config.write_mode {
+ match config.write_mode() {
WriteMode::Replace => {
if let Ok((ori, fmt)) = source_and_formatted_text(text, filename, config) {
if fmt != ori {
let bk_name = filename.to_owned() + ".bk";
{
// Write text to temp file
- let tmp_file = try!(File::create(&tmp_name));
- try!(write_system_newlines(tmp_file, text, config));
+ let tmp_file = File::create(&tmp_name)?;
+ write_system_newlines(tmp_file, text, config)?;
}
- try!(fs::rename(filename, bk_name));
- try!(fs::rename(tmp_name, filename));
+ fs::rename(filename, bk_name)?;
+ fs::rename(tmp_name, filename)?;
}
}
}
WriteMode::Overwrite => {
- // Write text directly over original file.
- let file = try!(File::create(filename));
- try!(write_system_newlines(file, text, config));
+ // Write text directly over original file if there is a diff.
+ let (source, formatted) = source_and_formatted_text(text, filename, config)?;
+ if source != formatted {
+ let file = File::create(filename)?;
+ write_system_newlines(file, text, config)?;
+ }
}
WriteMode::Plain => {
- let stdout = stdout();
- let stdout = stdout.lock();
- try!(write_system_newlines(stdout, text, config));
+ 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));
+ 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),
+ config.color(),
+ );
+ return Ok(has_diff);
}
}
WriteMode::Checkstyle => {
- let diff = try!(create_diff(filename, text, config));
- try!(output_checkstyle_file(out, filename, diff));
+ let diff = create_diff(filename, text, config)?;
+ output_checkstyle_file(out, filename, diff)?;
}
}
- Ok(None)
+ // when we are not in diff mode, don't indicate differing files
+ Ok(false)
}
projects / rust.git / blobdiff