Correct for changes in line numbers in expected stderr output.

EdSchouten · EdSchouten · commit c51f8783f27c · 2018-01-02T18:12:10.000+01:00
Due to the disable-cloudabi tags being added to the source files, the
expected output of the compiler is altered slightly.
diff --git a/src/test/ui/issue-46576.stderr b/src/test/ui/issue-46576.stderr
@@ -1,13 +1,13 @@
 error: unused import: `BufRead`
-  --> $DIR/issue-46576.rs:15:15
+  --> $DIR/issue-46576.rs:17:15
    |
-15 | use std::io::{BufRead, BufReader, Read};
+17 | use std::io::{BufRead, BufReader, Read};
    |               ^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/issue-46576.rs:12:9
+  --> $DIR/issue-46576.rs:14:9
    |
-12 | #![deny(unused_imports)]
+14 | #![deny(unused_imports)]
    |         ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/src/test/ui/lint/use_suggestion_json.stderr
@@ -73,10 +73,10 @@ mod foo {
   "spans": [
     {
       "file_name": "$DIR/use_suggestion_json.rs",
-      "byte_start": 888,
-      "byte_end": 892,
-      "line_start": 20,
-      "line_end": 20,
+      "byte_start": 907,
+      "byte_end": 911,
+      "line_start": 21,
+      "line_end": 21,
       "column_start": 12,
       "column_end": 16,
       "is_primary": true,
@@ -100,10 +100,10 @@ mod foo {
       "spans": [
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -122,10 +122,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -144,10 +144,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -166,10 +166,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -188,10 +188,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -210,10 +210,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -232,10 +232,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -254,10 +254,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -276,10 +276,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -298,10 +298,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -320,10 +320,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -342,10 +342,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 865,
-          "byte_end": 865,
-          "line_start": 19,
-          "line_end": 19,
+          "byte_start": 884,
+          "byte_end": 884,
+          "line_start": 20,
+          "line_end": 20,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -368,19 +368,19 @@ mod foo {
     }
   ],
   "rendered": "error[E0412]: cannot find type `Iter` in this scope
-  --> $DIR/use_suggestion_json.rs:20:12
+  --> $DIR/use_suggestion_json.rs:21:12
    |
-20 |     let x: Iter;
+21 |     let x: Iter;
    |            ^^^^ not found in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |
-19 | use std::collections::binary_heap::Iter;
+20 | use std::collections::binary_heap::Iter;
    |
-19 | use std::collections::btree_map::Iter;
+20 | use std::collections::btree_map::Iter;
    |
-19 | use std::collections::btree_set::Iter;
+20 | use std::collections::btree_set::Iter;
    |
-19 | use std::collections::hash_map::Iter;
+20 | use std::collections::hash_map::Iter;
    |
 and 8 other candidates
 
diff --git a/src/test/ui/mismatched_types/recovered-block.stderr b/src/test/ui/mismatched_types/recovered-block.stderr
@@ -1,17 +1,17 @@
 error: missing `struct` for struct definition
-  --> $DIR/recovered-block.rs:21:8
+  --> $DIR/recovered-block.rs:23:8
    |
-21 |     pub Foo { text }
+23 |     pub Foo { text }
    |        ^
 help: add `struct` here to parse `Foo` as a public struct
    |
-21 |     pub struct Foo { text }
+23 |     pub struct Foo { text }
    |         ^^^^^^
 
 error: expected one of `(` or `<`, found `{`
-  --> $DIR/recovered-block.rs:27:9
+  --> $DIR/recovered-block.rs:29:9
    |
-27 |     Foo { text: "".to_string() }
+29 |     Foo { text: "".to_string() }
    |         ^ expected one of `(` or `<` here
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/src/test/ui/resolve/token-error-correct-3.stderr
@@ -1,40 +1,40 @@
 error: incorrect close delimiter: `}`
-  --> $DIR/token-error-correct-3.rs:28:9
+  --> $DIR/token-error-correct-3.rs:30:9
    |
-28 |         } else { //~ ERROR: incorrect close delimiter: `}`
+30 |         } else { //~ ERROR: incorrect close delimiter: `}`
    |         ^
    |
 note: unclosed delimiter
-  --> $DIR/token-error-correct-3.rs:22:21
+  --> $DIR/token-error-correct-3.rs:24:21
    |
-22 |             callback(path.as_ref(); //~ ERROR expected one of
+24 |             callback(path.as_ref(); //~ ERROR expected one of
    |                     ^
 
 error: expected one of `,`, `.`, `?`, or an operator, found `;`
-  --> $DIR/token-error-correct-3.rs:22:35
+  --> $DIR/token-error-correct-3.rs:24:35
    |
-22 |             callback(path.as_ref(); //~ ERROR expected one of
+24 |             callback(path.as_ref(); //~ ERROR expected one of
    |                                   ^ expected one of `,`, `.`, `?`, or an operator here
 
 error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
-  --> $DIR/token-error-correct-3.rs:28:9
+  --> $DIR/token-error-correct-3.rs:30:9
    |
-23 |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
+25 |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
    |                                                             - expected one of `.`, `;`, `?`, `}`, or an operator here
 ...
-28 |         } else { //~ ERROR: incorrect close delimiter: `}`
+30 |         } else { //~ ERROR: incorrect close delimiter: `}`
    |         ^ unexpected token
 
 error[E0425]: cannot find function `is_directory` in this scope
-  --> $DIR/token-error-correct-3.rs:21:13
+  --> $DIR/token-error-correct-3.rs:23:13
    |
-21 |         if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory`
+23 |         if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory`
    |             ^^^^^^^^^^^^ not found in this scope
 
 error[E0308]: mismatched types
-  --> $DIR/token-error-correct-3.rs:23:13
+  --> $DIR/token-error-correct-3.rs:25:13
    |
-23 |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
+25 |             fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- help: try adding a semicolon: `;`
    |             |
    |             expected (), found enum `std::result::Result`
diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/src/test/ui/resolve/use_suggestion_placement.stderr
@@ -1,33 +1,33 @@
 error[E0412]: cannot find type `Path` in this scope
-  --> $DIR/use_suggestion_placement.rs:25:16
+  --> $DIR/use_suggestion_placement.rs:27:16
    |
-25 |     type Bar = Path; //~ ERROR cannot find
+27 |     type Bar = Path; //~ ERROR cannot find
    |                ^^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
-21 |     use std::path::Path;
+23 |     use std::path::Path;
    |
 
 error[E0425]: cannot find value `A` in this scope
-  --> $DIR/use_suggestion_placement.rs:30:13
+  --> $DIR/use_suggestion_placement.rs:32:13
    |
-30 |     let _ = A; //~ ERROR cannot find
+32 |     let _ = A; //~ ERROR cannot find
    |             ^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
-11 | use m::A;
+13 | use m::A;
    |
 
 error[E0412]: cannot find type `HashMap` in this scope
-  --> $DIR/use_suggestion_placement.rs:35:23
+  --> $DIR/use_suggestion_placement.rs:37:23
    |
-35 |     type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find
+37 |     type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find
    |                       ^^^^^^^ not found in this scope
 help: possible candidates are found in other modules, you can import them into scope
    |
-11 | use std::collections::HashMap;
+13 | use std::collections::HashMap;
    |
-11 | use std::collections::hash_map::HashMap;
+13 | use std::collections::hash_map::HashMap;
    |
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/span/issue-33884.stderr b/src/test/ui/span/issue-33884.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-33884.rs:16:22
+  --> $DIR/issue-33884.rs:18:22
    |
-16 |     stream.write_fmt(format!("message received"))
+18 |     stream.write_fmt(format!("message received"))
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::fmt::Arguments`, found struct `std::string::String`
    |
    = note: expected type `std::fmt::Arguments<'_>`
diff --git a/src/test/ui/suggestions/try-operator-on-main.stderr b/src/test/ui/suggestions/try-operator-on-main.stderr

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	error: unused import: `BufRead`
`2`		`- --> $DIR/issue-46576.rs:15:15`
	`2`	`+ --> $DIR/issue-46576.rs:17:15`
`3`	`3`	`\|`
`4`		`-15 \| use std::io::{BufRead, BufReader, Read};`
	`4`	`+17 \| use std::io::{BufRead, BufReader, Read};`
`5`	`5`	`\| ^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	`note: lint level defined here`
`8`		`- --> $DIR/issue-46576.rs:12:9`
	`8`	`+ --> $DIR/issue-46576.rs:14:9`
`9`	`9`	`\|`
`10`		`-12 \| #![deny(unused_imports)]`
	`10`	`+14 \| #![deny(unused_imports)]`
`11`	`11`	`\| ^^^^^^^^^^^^^^`
`12`	`12`
`13`	`13`	`error: aborting due to previous error`
Original file line number	Diff line number	Diff line change
`@@ -1,33 +1,33 @@`
`1`	`1`	error[E0412]: cannot find type `Path` in this scope
`2`		`- --> $DIR/use_suggestion_placement.rs:25:16`
	`2`	`+ --> $DIR/use_suggestion_placement.rs:27:16`
`3`	`3`	`\|`
`4`		`-25 \| type Bar = Path; //~ ERROR cannot find`
	`4`	`+27 \| type Bar = Path; //~ ERROR cannot find`
`5`	`5`	`\| ^^^^ not found in this scope`
`6`	`6`	`help: possible candidate is found in another module, you can import it into scope`
`7`	`7`	`\|`
`8`		`-21 \| use std::path::Path;`
	`8`	`+23 \| use std::path::Path;`
`9`	`9`	`\|`
`10`	`10`
`11`	`11`	error[E0425]: cannot find value `A` in this scope
`12`		`- --> $DIR/use_suggestion_placement.rs:30:13`
	`12`	`+ --> $DIR/use_suggestion_placement.rs:32:13`
`13`	`13`	`\|`
`14`		`-30 \| let _ = A; //~ ERROR cannot find`
	`14`	`+32 \| let _ = A; //~ ERROR cannot find`
`15`	`15`	`\| ^ not found in this scope`
`16`	`16`	`help: possible candidate is found in another module, you can import it into scope`
`17`	`17`	`\|`
`18`		`-11 \| use m::A;`
	`18`	`+13 \| use m::A;`
`19`	`19`	`\|`
`20`	`20`
`21`	`21`	error[E0412]: cannot find type `HashMap` in this scope
`22`		`- --> $DIR/use_suggestion_placement.rs:35:23`
	`22`	`+ --> $DIR/use_suggestion_placement.rs:37:23`
`23`	`23`	`\|`
`24`		`-35 \| type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find`
	`24`	`+37 \| type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find`
`25`	`25`	`\| ^^^^^^^ not found in this scope`
`26`	`26`	`help: possible candidates are found in other modules, you can import them into scope`
`27`	`27`	`\|`
`28`		`-11 \| use std::collections::HashMap;`
	`28`	`+13 \| use std::collections::HashMap;`
`29`	`29`	`\|`
`30`		`-11 \| use std::collections::hash_map::HashMap;`
	`30`	`+13 \| use std::collections::hash_map::HashMap;`
`31`	`31`	`\|`
`32`	`32`
`33`	`33`	`error: aborting due to 3 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/issue-33884.rs:16:22`
	`2`	`+ --> $DIR/issue-33884.rs:18:22`
`3`	`3`	`\|`
`4`		`-16 \| stream.write_fmt(format!("message received"))`
	`4`	`+18 \| stream.write_fmt(format!("message received"))`
`5`	`5`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::fmt::Arguments`, found struct `std::string::String`
`6`	`6`	`\|`
`7`	`7`	= note: expected type `std::fmt::Arguments<'_>`