Reconcile stderr files with trybuild

dtolnay · dtolnay · commit 782039801b57 · 2019-05-06T09:47:32.000-07:00
diff --git a/seq/tests/03-expand-four-errors.stderr b/seq/tests/03-expand-four-errors.stderr
@@ -1,21 +1,23 @@
 error: error number 0
+  --> $DIR/03-expand-four-errors.rs:20:5
    |
 20 |     compile_error!(concat!("error number ", stringify!(N)));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: error number 1
+  --> $DIR/03-expand-four-errors.rs:20:5
    |
 20 |     compile_error!(concat!("error number ", stringify!(N)));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: error number 2
+  --> $DIR/03-expand-four-errors.rs:20:5
    |
 20 |     compile_error!(concat!("error number ", stringify!(N)));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: error number 3
+  --> $DIR/03-expand-four-errors.rs:20:5
    |
 20 |     compile_error!(concat!("error number ", stringify!(N)));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 4 previous errors
diff --git a/seq/tests/09-ident-span.stderr b/seq/tests/09-ident-span.stderr
@@ -1,4 +1,5 @@
 error[E0425]: cannot find value `Missing0` in this scope
+  --> $DIR/09-ident-span.rs:34:17
    |
 34 |         let _ = Missing#N;
    |                 ^^^^^^^ not found in this scope
diff --git a/sorted/tests/03-out-of-order.stderr b/sorted/tests/03-out-of-order.stderr
@@ -1,4 +1,5 @@
 error: SomethingFailed should sort before ThatFailed
+  --> $DIR/03-out-of-order.rs:20:5
    |
 20 |     SomethingFailed,
    |     ^^^^^^^^^^^^^^^
diff --git a/sorted/tests/04-variants-with-data.stderr b/sorted/tests/04-variants-with-data.stderr
@@ -1,4 +1,5 @@
 error: Dyn should sort before Fmt
+  --> $DIR/04-variants-with-data.rs:19:5
    |
 19 |     Dyn(Box<dyn StdError>),
    |     ^^^

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,23 @@`
`1`	`1`	`error: error number 0`
	`2`	`+ --> $DIR/03-expand-four-errors.rs:20:5`
`2`	`3`	`\|`
`3`	`4`	`20 \| compile_error!(concat!("error number ", stringify!(N)));`
`4`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`5`	`6`
`6`	`7`	`error: error number 1`
	`8`	`+ --> $DIR/03-expand-four-errors.rs:20:5`
`7`	`9`	`\|`
`8`	`10`	`20 \| compile_error!(concat!("error number ", stringify!(N)));`
`9`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`10`	`12`
`11`	`13`	`error: error number 2`
	`14`	`+ --> $DIR/03-expand-four-errors.rs:20:5`
`12`	`15`	`\|`
`13`	`16`	`20 \| compile_error!(concat!("error number ", stringify!(N)));`
`14`	`17`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`15`	`18`
`16`	`19`	`error: error number 3`
	`20`	`+ --> $DIR/03-expand-four-errors.rs:20:5`
`17`	`21`	`\|`
`18`	`22`	`20 \| compile_error!(concat!("error number ", stringify!(N)));`
`19`	`23`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`20`		`-`
`21`		`-error: aborting due to 4 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	error[E0425]: cannot find value `Missing0` in this scope
	`2`	`+ --> $DIR/09-ident-span.rs:34:17`
`2`	`3`	`\|`
`3`	`4`	`34 \| let _ = Missing#N;`
`4`	`5`	`\| ^^^^^^^ not found in this scope`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`error: SomethingFailed should sort before ThatFailed`
	`2`	`+ --> $DIR/03-out-of-order.rs:20:5`
`2`	`3`	`\|`
`3`	`4`	`20 \| SomethingFailed,`
`4`	`5`	`\| ^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`error: Dyn should sort before Fmt`
	`2`	`+ --> $DIR/04-variants-with-data.rs:19:5`
`2`	`3`	`\|`
`3`	`4`	`19 \| Dyn(Box<dyn StdError>),`
`4`	`5`	`\| ^^^`