Fix tests after merging with master.

Author: jugglerchris

src/filemap.rs

@@ -168,6 +168,7 @@ where
             }
         }
         WriteMode::Modified => {
+            let filename = filename_to_path();
             if let Ok((ori, fmt)) = source_and_formatted_text(text, filename, config) {
                 let mismatch = make_diff(&ori, &fmt, 0);
                 let has_diff = !mismatch.is_empty();

src/lib.rs

@@ -712,7 +712,6 @@ pub struct ModifiedLines {
     pub chunks: Vec<ModifiedChunk>,
 }
 
-
 /// Format a file and return a `ModifiedLines` data structure describing
 /// the changed ranges of lines.
 pub fn get_modified_lines(

src/rustfmt_diff.rs

@@ -184,21 +184,18 @@ where
     W: Write,
 {
     for mismatch in diff {
-        let (num_removed, num_added) = mismatch.lines.iter().fold(
-            (0, 0),
-            |(rem, add), line| match *line {
+        let (num_removed, num_added) = mismatch.lines.iter().fold((0, 0), |(rem, add), line| {
+            match *line {
                 DiffLine::Context(_) => panic!("No Context expected"),
                 DiffLine::Expected(_) => (rem, add + 1),
                 DiffLine::Resulting(_) => (rem + 1, add),
-            },
-        );
+            }
+        });
         // Write a header with enough information to separate the modified lines.
         writeln!(
             out,
             "{} {} {}",
-            mismatch.line_number_orig,
-            num_removed,
-            num_added
+            mismatch.line_number_orig, num_removed, num_added
         ).unwrap();
 
         for line in mismatch.lines {
@@ -297,6 +294,7 @@ mod test {
             vec![
                 Mismatch {
                     line_number: 5,
+                    line_number_orig: 5,
                     lines: vec![Context("five".to_owned()), Expected("".to_owned())],
                 },
             ]

tests/system.rs

@@ -159,8 +159,8 @@ fn modified_test() {
                     lines: vec!["fn blah() {}".into()],
                 },
                 ModifiedChunk {
-                    line_number: 10,
-                    lines_removed: 5,
+                    line_number: 9,
+                    lines_removed: 6,
                     lines: vec!["#[cfg(a, b)]".into(), "fn main() {}".into()],
                 },
             ],