Merge pull request #2138 from topecongiro/comments-around-trait-bounds

[rust.git] / src / rustfmt_diff.rs

diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs
index d6b021d42d4ee06e6acf698db59c71c19f90de04..c0aca68fe2ffebba94a00a4fafc5941385a79310 100644 (file)
--- a/src/rustfmt_diff.rs
+++ b/src/rustfmt_diff.rs
@@ -165,52 +165,72 @@ pub fn print_diff_basic<F>(diff: Vec<Mismatch>, get_section_title: F)
 
 #[cfg(test)]
 mod test {
-    use super::{make_diff,Mismatch};
+    use super::{make_diff, Mismatch};
     use super::DiffLine::*;
 
     #[test]
     fn diff_simple() {
         let src = "one\ntwo\nthree\nfour\nfive\n";
-        let dest= "one\ntwo\ntrois\nfour\nfive\n";
+        let dest = "one\ntwo\ntrois\nfour\nfive\n";
         let diff = make_diff(src, dest, 1);
-        assert_eq!(diff, vec![Mismatch { line_number: 2,
-                                         lines: vec![
-                                             Context("two".into()),
-                                             Resulting("three".into()),
-                                             Expected("trois".into()),
-                                             Context("four".into()),
-                                         ] }]);
+        assert_eq!(
+            diff,
+            vec![
+                Mismatch {
+                    line_number: 2,
+                    lines: vec![
+                        Context("two".into()),
+                        Resulting("three".into()),
+                        Expected("trois".into()),
+                        Context("four".into()),
+                    ],
+                },
+            ]
+        );
     }
 
     #[test]
     fn diff_simple2() {
         let src = "one\ntwo\nthree\nfour\nfive\nsix\nseven\n";
-        let dest= "one\ntwo\ntrois\nfour\ncinq\nsix\nseven\n";
+        let dest = "one\ntwo\ntrois\nfour\ncinq\nsix\nseven\n";
         let diff = make_diff(src, dest, 1);
-        assert_eq!(diff, vec![Mismatch { line_number: 2,
-                                         lines: vec![
-                                             Context("two".into()),
-                                             Resulting("three".into()),
-                                             Expected("trois".into()),
-                                             Context("four".into()),
-                                         ] },
-                              Mismatch { line_number: 5,
-                                         lines: vec![
-                                             Resulting("five".into()),
-                                             Expected("cinq".into()),
-                                             Context("six".into()),
-                                         ] }]);
+        assert_eq!(
+            diff,
+            vec![
+                Mismatch {
+                    line_number: 2,
+                    lines: vec![
+                        Context("two".into()),
+                        Resulting("three".into()),
+                        Expected("trois".into()),
+                        Context("four".into()),
+                    ],
+                },
+                Mismatch {
+                    line_number: 5,
+                    lines: vec![
+                        Resulting("five".into()),
+                        Expected("cinq".into()),
+                        Context("six".into()),
+                    ],
+                },
+            ]
+        );
     }
 
     #[test]
     fn diff_zerocontext() {
         let src = "one\ntwo\nthree\nfour\nfive\n";
-        let dest= "one\ntwo\ntrois\nfour\nfive\n";
+        let dest = "one\ntwo\ntrois\nfour\nfive\n";
         let diff = make_diff(src, dest, 0);
-        assert_eq!(diff, vec![Mismatch { line_number: 3,
-                                         lines: vec![
-                                             Resulting("three".into()),
-                                             Expected("trois".into()),
-                                         ] }]);
+        assert_eq!(
+            diff,
+            vec![
+                Mismatch {
+                    line_number: 3,
+                    lines: vec![Resulting("three".into()), Expected("trois".into())],
+                },
+            ]
+        );
     }
-}
\ No newline at end of file
+}