---

yaml
---
r: 277941
b: refs/heads/auto
c: ba12ed0
h: refs/heads/master
i:
  277939: 4ea668e

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 5db4d620f2727113dfd5dd16fdb9417b9afda9d2
+refs/heads/auto: ba12ed06edf119c1d543158b8d0ac7d7ec503d82
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libsyntax/errors/emitter.rs

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

branches/auto/src/libsyntax/errors/snippet/test.rs

@@ -405,8 +405,8 @@ impl SomeTrait for () {
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
 >>>>>> foo.rs
-3   |>     fn foo(x: u32) {
-    |>     -
+3 |>     fn foo(x: u32) {
+  |>     -
 "#[1..]);
 }
 
@@ -516,6 +516,6 @@ fn span_overlap_label3() {
 3 |>        let closure = || {
   |>                      - foo
 4 |>            inner
-  |>            ---- bar
+  |>            ----- bar
 "#[1..]);
 }