fix snippet tests MORE!

Author: nikomatsakis

src/libsyntax/errors/emitter.rs

@@ -555,7 +555,7 @@ mod test {
         let str = from_utf8(vec).unwrap();
         println!("r#\"\n{}\"#", str);
         assert_eq!(str, &r#"
-   --> dummy.txt:11:1
+  --> dummy.txt:11:1
 11 |>         e-lä-vän
    |> ^
 "#[1..]);

src/libsyntax/errors/snippet/test.rs

@@ -404,7 +404,7 @@ impl SomeTrait for () {
     let text: String = make_string(&lines);
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
->>>>>> foo.rs
+>>>> foo.rs
 3 |>     fn foo(x: u32) {
   |>     -
 "#[1..]);