---

yaml
---
r: 277550
b: refs/heads/try
c: ba12ed0
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 5db4d620f2727113dfd5dd16fdb9417b9afda9d2
+refs/heads/try: ba12ed06edf119c1d543158b8d0ac7d7ec503d82
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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/try/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..]);
 }