user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1123 from juicejitsu/807

Browse source 
Don't emit filename in diff mode, add filename to diff metadata
This commit is contained in:
Nick Cameron 2016-08-10 21:52:46 +12:00 • committed by GitHub
commit e1759ae295
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/filemap.rs
View file

@ -144,11 +144,11 @@ pub fn write_file<T>(text: &StringBuffer,
try!(write_system_newlines(stdout, 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);
}
}