Merge pull request #2122 from sinkuu/local_span

oli-obk · web-flow · commit 408b5220a8c1 · 2017-10-10T09:39:10.000+02:00
Test failure fix with rustc 1.22.0-nightly (150b625 2017-10-08)
diff --git a/tests/ui/shadow.stderr b/tests/ui/shadow.stderr
@@ -2,7 +2,7 @@ error: `x` is shadowed by itself in `&mut x`
   --> $DIR/shadow.rs:13:5
    |
 13 |     let x = &mut x;
-   |     ^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^
    |
    = note: `-D shadow-same` implied by `-D warnings`
 note: previous binding is here
@@ -15,7 +15,7 @@ error: `x` is shadowed by itself in `{ x }`
   --> $DIR/shadow.rs:14:5
    |
 14 |     let x = { x };
-   |     ^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^
    |
 note: previous binding is here
   --> $DIR/shadow.rs:13:9
@@ -27,7 +27,7 @@ error: `x` is shadowed by itself in `(&*x)`
   --> $DIR/shadow.rs:15:5
    |
 15 |     let x = (&*x);
-   |     ^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^
    |
 note: previous binding is here
   --> $DIR/shadow.rs:14:9
@@ -126,7 +126,7 @@ error: `x` shadows a previous declaration
   --> $DIR/shadow.rs:23:5
    |
 23 |     let x;
-   |     ^^^^^
+   |     ^^^^^^
    |
 note: previous binding is here
   --> $DIR/shadow.rs:21:9

Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `x` is shadowed by itself in `&mut x`
`2`	`2`	`--> $DIR/shadow.rs:13:5`
`3`	`3`	`\|`
`4`	`4`	`13 \| let x = &mut x;`
`5`		`- \| ^^^^^^^^^^^^^^`
	`5`	`+ \| ^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: `-D shadow-same` implied by `-D warnings`
`8`	`8`	`note: previous binding is here`
@@ -15,7 +15,7 @@ error: `x` is shadowed by itself in `{ x }`
`15`	`15`	`--> $DIR/shadow.rs:14:5`
`16`	`16`	`\|`
`17`	`17`	`14 \| let x = { x };`
`18`		`- \| ^^^^^^^^^^^^^`
	`18`	`+ \| ^^^^^^^^^^^^^^`
`19`	`19`	`\|`
`20`	`20`	`note: previous binding is here`
`21`	`21`	`--> $DIR/shadow.rs:13:9`
@@ -27,7 +27,7 @@ error: `x` is shadowed by itself in `(&*x)`
`27`	`27`	`--> $DIR/shadow.rs:15:5`
`28`	`28`	`\|`
`29`	`29`	`15 \| let x = (&*x);`
`30`		`- \| ^^^^^^^^^^^^^`
	`30`	`+ \| ^^^^^^^^^^^^^^`
`31`	`31`	`\|`
`32`	`32`	`note: previous binding is here`
`33`	`33`	`--> $DIR/shadow.rs:14:9`
@@ -126,7 +126,7 @@ error: `x` shadows a previous declaration
`126`	`126`	`--> $DIR/shadow.rs:23:5`
`127`	`127`	`\|`
`128`	`128`	`23 \| let x;`
`129`		`- \| ^^^^^`
	`129`	`+ \| ^^^^^^`
`130`	`130`	`\|`
`131`	`131`	`note: previous binding is here`
`132`	`132`	`--> $DIR/shadow.rs:21:9`