Skip to content

Commit c51f878

Browse files
EdSchoutenEdSchouten
committed
Correct for changes in line numbers in expected stderr output.
Due to the disable-cloudabi tags being added to the source files, the expected output of the compiler is altered slightly.
1 parent abced5a commit c51f878

File tree

7 files changed

+100
-100
lines changed

7 files changed

+100
-100
lines changed

‎src/test/ui/issue-46576.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: unused import: `BufRead`
2-
--> $DIR/issue-46576.rs:15:15
2+
--> $DIR/issue-46576.rs:17:15
33
|
4-
15 | use std::io::{BufRead, BufReader, Read};
4+
17 | use std::io::{BufRead, BufReader, Read};
55
| ^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/issue-46576.rs:12:9
8+
--> $DIR/issue-46576.rs:14:9
99
|
10-
12 | #![deny(unused_imports)]
10+
14 | #![deny(unused_imports)]
1111
| ^^^^^^^^^^^^^^
1212

1313
error: aborting due to previous error

‎src/test/ui/lint/use_suggestion_json.stderr‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ mod foo {
7373
"spans": [
7474
{
7575
"file_name": "$DIR/use_suggestion_json.rs",
76-
"byte_start": 888,
77-
"byte_end": 892,
78-
"line_start": 20,
79-
"line_end": 20,
76+
"byte_start": 907,
77+
"byte_end": 911,
78+
"line_start": 21,
79+
"line_end": 21,
8080
"column_start": 12,
8181
"column_end": 16,
8282
"is_primary": true,
@@ -100,10 +100,10 @@ mod foo {
100100
"spans": [
101101
{
102102
"file_name": "$DIR/use_suggestion_json.rs",
103-
"byte_start": 865,
104-
"byte_end": 865,
105-
"line_start": 19,
106-
"line_end": 19,
103+
"byte_start": 884,
104+
"byte_end": 884,
105+
"line_start": 20,
106+
"line_end": 20,
107107
"column_start": 1,
108108
"column_end": 1,
109109
"is_primary": true,
@@ -122,10 +122,10 @@ mod foo {
122122
},
123123
{
124124
"file_name": "$DIR/use_suggestion_json.rs",
125-
"byte_start": 865,
126-
"byte_end": 865,
127-
"line_start": 19,
128-
"line_end": 19,
125+
"byte_start": 884,
126+
"byte_end": 884,
127+
"line_start": 20,
128+
"line_end": 20,
129129
"column_start": 1,
130130
"column_end": 1,
131131
"is_primary": true,
@@ -144,10 +144,10 @@ mod foo {
144144
},
145145
{
146146
"file_name": "$DIR/use_suggestion_json.rs",
147-
"byte_start": 865,
148-
"byte_end": 865,
149-
"line_start": 19,
150-
"line_end": 19,
147+
"byte_start": 884,
148+
"byte_end": 884,
149+
"line_start": 20,
150+
"line_end": 20,
151151
"column_start": 1,
152152
"column_end": 1,
153153
"is_primary": true,
@@ -166,10 +166,10 @@ mod foo {
166166
},
167167
{
168168
"file_name": "$DIR/use_suggestion_json.rs",
169-
"byte_start": 865,
170-
"byte_end": 865,
171-
"line_start": 19,
172-
"line_end": 19,
169+
"byte_start": 884,
170+
"byte_end": 884,
171+
"line_start": 20,
172+
"line_end": 20,
173173
"column_start": 1,
174174
"column_end": 1,
175175
"is_primary": true,
@@ -188,10 +188,10 @@ mod foo {
188188
},
189189
{
190190
"file_name": "$DIR/use_suggestion_json.rs",
191-
"byte_start": 865,
192-
"byte_end": 865,
193-
"line_start": 19,
194-
"line_end": 19,
191+
"byte_start": 884,
192+
"byte_end": 884,
193+
"line_start": 20,
194+
"line_end": 20,
195195
"column_start": 1,
196196
"column_end": 1,
197197
"is_primary": true,
@@ -210,10 +210,10 @@ mod foo {
210210
},
211211
{
212212
"file_name": "$DIR/use_suggestion_json.rs",
213-
"byte_start": 865,
214-
"byte_end": 865,
215-
"line_start": 19,
216-
"line_end": 19,
213+
"byte_start": 884,
214+
"byte_end": 884,
215+
"line_start": 20,
216+
"line_end": 20,
217217
"column_start": 1,
218218
"column_end": 1,
219219
"is_primary": true,
@@ -232,10 +232,10 @@ mod foo {
232232
},
233233
{
234234
"file_name": "$DIR/use_suggestion_json.rs",
235-
"byte_start": 865,
236-
"byte_end": 865,
237-
"line_start": 19,
238-
"line_end": 19,
235+
"byte_start": 884,
236+
"byte_end": 884,
237+
"line_start": 20,
238+
"line_end": 20,
239239
"column_start": 1,
240240
"column_end": 1,
241241
"is_primary": true,
@@ -254,10 +254,10 @@ mod foo {
254254
},
255255
{
256256
"file_name": "$DIR/use_suggestion_json.rs",
257-
"byte_start": 865,
258-
"byte_end": 865,
259-
"line_start": 19,
260-
"line_end": 19,
257+
"byte_start": 884,
258+
"byte_end": 884,
259+
"line_start": 20,
260+
"line_end": 20,
261261
"column_start": 1,
262262
"column_end": 1,
263263
"is_primary": true,
@@ -276,10 +276,10 @@ mod foo {
276276
},
277277
{
278278
"file_name": "$DIR/use_suggestion_json.rs",
279-
"byte_start": 865,
280-
"byte_end": 865,
281-
"line_start": 19,
282-
"line_end": 19,
279+
"byte_start": 884,
280+
"byte_end": 884,
281+
"line_start": 20,
282+
"line_end": 20,
283283
"column_start": 1,
284284
"column_end": 1,
285285
"is_primary": true,
@@ -298,10 +298,10 @@ mod foo {
298298
},
299299
{
300300
"file_name": "$DIR/use_suggestion_json.rs",
301-
"byte_start": 865,
302-
"byte_end": 865,
303-
"line_start": 19,
304-
"line_end": 19,
301+
"byte_start": 884,
302+
"byte_end": 884,
303+
"line_start": 20,
304+
"line_end": 20,
305305
"column_start": 1,
306306
"column_end": 1,
307307
"is_primary": true,
@@ -320,10 +320,10 @@ mod foo {
320320
},
321321
{
322322
"file_name": "$DIR/use_suggestion_json.rs",
323-
"byte_start": 865,
324-
"byte_end": 865,
325-
"line_start": 19,
326-
"line_end": 19,
323+
"byte_start": 884,
324+
"byte_end": 884,
325+
"line_start": 20,
326+
"line_end": 20,
327327
"column_start": 1,
328328
"column_end": 1,
329329
"is_primary": true,
@@ -342,10 +342,10 @@ mod foo {
342342
},
343343
{
344344
"file_name": "$DIR/use_suggestion_json.rs",
345-
"byte_start": 865,
346-
"byte_end": 865,
347-
"line_start": 19,
348-
"line_end": 19,
345+
"byte_start": 884,
346+
"byte_end": 884,
347+
"line_start": 20,
348+
"line_end": 20,
349349
"column_start": 1,
350350
"column_end": 1,
351351
"is_primary": true,
@@ -368,19 +368,19 @@ mod foo {
368368
}
369369
],
370370
"rendered": "error[E0412]: cannot find type `Iter` in this scope
371-
--> $DIR/use_suggestion_json.rs:20:12
371+
--> $DIR/use_suggestion_json.rs:21:12
372372
|
373-
20 | let x: Iter;
373+
21 | let x: Iter;
374374
| ^^^^ not found in this scope
375375
help: possible candidates are found in other modules, you can import them into scope
376376
|
377-
19 | use std::collections::binary_heap::Iter;
377+
20 | use std::collections::binary_heap::Iter;
378378
|
379-
19 | use std::collections::btree_map::Iter;
379+
20 | use std::collections::btree_map::Iter;
380380
|
381-
19 | use std::collections::btree_set::Iter;
381+
20 | use std::collections::btree_set::Iter;
382382
|
383-
19 | use std::collections::hash_map::Iter;
383+
20 | use std::collections::hash_map::Iter;
384384
|
385385
and 8 other candidates
386386

‎src/test/ui/mismatched_types/recovered-block.stderr‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error: missing `struct` for struct definition
2-
--> $DIR/recovered-block.rs:21:8
2+
--> $DIR/recovered-block.rs:23:8
33
|
4-
21 | pub Foo { text }
4+
23 | pub Foo { text }
55
| ^
66
help: add `struct` here to parse `Foo` as a public struct
77
|
8-
21 | pub struct Foo { text }
8+
23 | pub struct Foo { text }
99
| ^^^^^^
1010

1111
error: expected one of `(` or `<`, found `{`
12-
--> $DIR/recovered-block.rs:27:9
12+
--> $DIR/recovered-block.rs:29:9
1313
|
14-
27 | Foo { text: "".to_string() }
14+
29 | Foo { text: "".to_string() }
1515
| ^ expected one of `(` or `<` here
1616

1717
error: aborting due to 2 previous errors

‎src/test/ui/resolve/token-error-correct-3.stderr‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
error: incorrect close delimiter: `}`
2-
--> $DIR/token-error-correct-3.rs:28:9
2+
--> $DIR/token-error-correct-3.rs:30:9
33
|
4-
28 | } else { //~ ERROR: incorrect close delimiter: `}`
4+
30 | } else { //~ ERROR: incorrect close delimiter: `}`
55
| ^
66
|
77
note: unclosed delimiter
8-
--> $DIR/token-error-correct-3.rs:22:21
8+
--> $DIR/token-error-correct-3.rs:24:21
99
|
10-
22 | callback(path.as_ref(); //~ ERROR expected one of
10+
24 | callback(path.as_ref(); //~ ERROR expected one of
1111
| ^
1212

1313
error: expected one of `,`, `.`, `?`, or an operator, found `;`
14-
--> $DIR/token-error-correct-3.rs:22:35
14+
--> $DIR/token-error-correct-3.rs:24:35
1515
|
16-
22 | callback(path.as_ref(); //~ ERROR expected one of
16+
24 | callback(path.as_ref(); //~ ERROR expected one of
1717
| ^ expected one of `,`, `.`, `?`, or an operator here
1818

1919
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
20-
--> $DIR/token-error-correct-3.rs:28:9
20+
--> $DIR/token-error-correct-3.rs:30:9
2121
|
22-
23 | fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
22+
25 | fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
2323
| - expected one of `.`, `;`, `?`, `}`, or an operator here
2424
...
25-
28 | } else { //~ ERROR: incorrect close delimiter: `}`
25+
30 | } else { //~ ERROR: incorrect close delimiter: `}`
2626
| ^ unexpected token
2727

2828
error[E0425]: cannot find function `is_directory` in this scope
29-
--> $DIR/token-error-correct-3.rs:21:13
29+
--> $DIR/token-error-correct-3.rs:23:13
3030
|
31-
21 | if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory`
31+
23 | if !is_directory(path.as_ref()) { //~ ERROR: cannot find function `is_directory`
3232
| ^^^^^^^^^^^^ not found in this scope
3333

3434
error[E0308]: mismatched types
35-
--> $DIR/token-error-correct-3.rs:23:13
35+
--> $DIR/token-error-correct-3.rs:25:13
3636
|
37-
23 | fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
37+
25 | fs::create_dir_all(path.as_ref()).map(|()| true) //~ ERROR: mismatched types
3838
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^- help: try adding a semicolon: `;`
3939
| |
4040
| expected (), found enum `std::result::Result`

‎src/test/ui/resolve/use_suggestion_placement.stderr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
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
33
|
4-
25 | type Bar = Path; //~ ERROR cannot find
4+
27 | type Bar = Path; //~ ERROR cannot find
55
| ^^^^ not found in this scope
66
help: possible candidate is found in another module, you can import it into scope
77
|
8-
21 | use std::path::Path;
8+
23 | use std::path::Path;
99
|
1010

1111
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
1313
|
14-
30 | let _ = A; //~ ERROR cannot find
14+
32 | let _ = A; //~ ERROR cannot find
1515
| ^ not found in this scope
1616
help: possible candidate is found in another module, you can import it into scope
1717
|
18-
11 | use m::A;
18+
13 | use m::A;
1919
|
2020

2121
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
2323
|
24-
35 | type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find
24+
37 | type Dict<K, V> = HashMap<K, V>; //~ ERROR cannot find
2525
| ^^^^^^^ not found in this scope
2626
help: possible candidates are found in other modules, you can import them into scope
2727
|
28-
11 | use std::collections::HashMap;
28+
13 | use std::collections::HashMap;
2929
|
30-
11 | use std::collections::hash_map::HashMap;
30+
13 | use std::collections::hash_map::HashMap;
3131
|
3232

3333
error: aborting due to 3 previous errors

‎src/test/ui/span/issue-33884.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0308]: mismatched types
2-
--> $DIR/issue-33884.rs:16:22
2+
--> $DIR/issue-33884.rs:18:22
33
|
4-
16 | stream.write_fmt(format!("message received"))
4+
18 | stream.write_fmt(format!("message received"))
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::fmt::Arguments`, found struct `std::string::String`
66
|
77
= note: expected type `std::fmt::Arguments<'_>`

0 commit comments

Comments
 (0)