Skip to content

Commit fa2d9fc

Browse files
petrochenkovpetrochenkov
committed
Update UI tests
1 parent cdbd8c2 commit fa2d9fc

File tree

1,200 files changed

+6168
-6168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,200 files changed

+6168
-6168
lines changed

‎src/test/ui-fulldeps/custom-derive/issue-36935.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: proc-macro derive panicked
22
--> $DIR/issue-36935.rs:18:15
33
|
4-
18 | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
4+
LL | #[derive(Foo, Bar)] //~ ERROR proc-macro derive panicked
55
| ^^^
66
|
77
= help: message: lolnope

‎src/test/ui-fulldeps/deprecated-derive.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
warning: derive(Encodable) is deprecated in favor of derive(RustcEncodable)
22
--> $DIR/deprecated-derive.rs:18:10
33
|
4-
18 | #[derive(Encodable)]
4+
LL | #[derive(Encodable)]
55
| ^^^^^^^^^
66

‎src/test/ui-fulldeps/lint-group-plugin.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
warning: item is named 'lintme'
22
--> $DIR/lint-group-plugin.rs:18:1
33
|
4-
18 | fn lintme() { } //~ WARNING item is named 'lintme'
4+
LL | fn lintme() { } //~ WARNING item is named 'lintme'
55
| ^^^^^^^^^^^^^^^
66
|
77
= note: #[warn(test_lint)] on by default
88

99
warning: item is named 'pleaselintme'
1010
--> $DIR/lint-group-plugin.rs:19:1
1111
|
12-
19 | fn pleaselintme() { } //~ WARNING item is named 'pleaselintme'
12+
LL | fn pleaselintme() { } //~ WARNING item is named 'pleaselintme'
1313
| ^^^^^^^^^^^^^^^^^^^^^
1414
|
1515
= note: #[warn(please_lint)] on by default

‎src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
warning: function is never used: `lintme`
22
--> $DIR/lint-plugin-cmdline-allow.rs:20:1
33
|
4-
20 | fn lintme() { }
4+
LL | fn lintme() { }
55
| ^^^^^^^^^^^
66
|
77
note: lint level defined here
88
--> $DIR/lint-plugin-cmdline-allow.rs:17:9
99
|
10-
17 | #![warn(unused)]
10+
LL | #![warn(unused)]
1111
| ^^^^^^
1212
= note: #[warn(dead_code)] implied by #[warn(unused)]
1313

‎src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
warning: item is named 'lintme'
22
--> $DIR/lint-plugin-cmdline-load.rs:18:1
33
|
4-
18 | fn lintme() { } //~ WARNING item is named 'lintme'
4+
LL | fn lintme() { } //~ WARNING item is named 'lintme'
55
| ^^^^^^^^^^^^^^^
66
|
77
= note: #[warn(test_lint)] on by default

‎src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
error: item is named 'lintme'
22
--> $DIR/lint-plugin-forbid-attrs.rs:18:1
33
|
4-
18 | fn lintme() { } //~ ERROR item is named 'lintme'
4+
LL | fn lintme() { } //~ ERROR item is named 'lintme'
55
| ^^^^^^^^^^^^^^^
66
|
77
note: lint level defined here
88
--> $DIR/lint-plugin-forbid-attrs.rs:16:11
99
|
10-
16 | #![forbid(test_lint)]
10+
LL | #![forbid(test_lint)]
1111
| ^^^^^^^^^
1212

1313
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint)
1414
--> $DIR/lint-plugin-forbid-attrs.rs:20:9
1515
|
16-
16 | #![forbid(test_lint)]
16+
LL | #![forbid(test_lint)]
1717
| --------- `forbid` level set here
1818
...
19-
20 | #[allow(test_lint)]
19+
LL | #[allow(test_lint)]
2020
| ^^^^^^^^^ overruled by previous forbid
2121

2222
error: aborting due to 2 previous errors

‎src/test/ui-fulldeps/lint-plugin.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
warning: item is named 'lintme'
22
--> $DIR/lint-plugin.rs:18:1
33
|
4-
18 | fn lintme() { } //~ WARNING item is named 'lintme'
4+
LL | fn lintme() { } //~ WARNING item is named 'lintme'
55
| ^^^^^^^^^^^^^^^
66
|
77
= note: #[warn(test_lint)] on by default

‎src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,127 @@
11
error: first final: "hello"
22
--> $DIR/parent-source-spans.rs:27:12
33
|
4-
27 | three!($a, $b);
4+
LL | three!($a, $b);
55
| ^^
66
...
7-
44 | one!("hello", "world");
7+
LL | one!("hello", "world");
88
| ----------------------- in this macro invocation
99

1010
error: second final: "world"
1111
--> $DIR/parent-source-spans.rs:27:16
1212
|
13-
27 | three!($a, $b);
13+
LL | three!($a, $b);
1414
| ^^
1515
...
16-
44 | one!("hello", "world");
16+
LL | one!("hello", "world");
1717
| ----------------------- in this macro invocation
1818

1919
error: first parent: "hello"
2020
--> $DIR/parent-source-spans.rs:21:5
2121
|
22-
21 | two!($a, $b);
22+
LL | two!($a, $b);
2323
| ^^^^^^^^^^^^^
2424
...
25-
44 | one!("hello", "world");
25+
LL | one!("hello", "world");
2626
| ----------------------- in this macro invocation
2727

2828
error: second parent: "world"
2929
--> $DIR/parent-source-spans.rs:21:5
3030
|
31-
21 | two!($a, $b);
31+
LL | two!($a, $b);
3232
| ^^^^^^^^^^^^^
3333
...
34-
44 | one!("hello", "world");
34+
LL | one!("hello", "world");
3535
| ----------------------- in this macro invocation
3636

3737
error: first grandparent: "hello"
3838
--> $DIR/parent-source-spans.rs:44:5
3939
|
40-
44 | one!("hello", "world");
40+
LL | one!("hello", "world");
4141
| ^^^^^^^^^^^^^^^^^^^^^^^
4242

4343
error: second grandparent: "world"
4444
--> $DIR/parent-source-spans.rs:44:5
4545
|
46-
44 | one!("hello", "world");
46+
LL | one!("hello", "world");
4747
| ^^^^^^^^^^^^^^^^^^^^^^^
4848

4949
error: first source: "hello"
5050
--> $DIR/parent-source-spans.rs:44:5
5151
|
52-
44 | one!("hello", "world");
52+
LL | one!("hello", "world");
5353
| ^^^^^^^^^^^^^^^^^^^^^^^
5454

5555
error: second source: "world"
5656
--> $DIR/parent-source-spans.rs:44:5
5757
|
58-
44 | one!("hello", "world");
58+
LL | one!("hello", "world");
5959
| ^^^^^^^^^^^^^^^^^^^^^^^
6060

6161
error: first final: "yay"
6262
--> $DIR/parent-source-spans.rs:27:12
6363
|
64-
27 | three!($a, $b);
64+
LL | three!($a, $b);
6565
| ^^
6666
...
67-
50 | two!("yay", "rust");
67+
LL | two!("yay", "rust");
6868
| -------------------- in this macro invocation
6969

7070
error: second final: "rust"
7171
--> $DIR/parent-source-spans.rs:27:16
7272
|
73-
27 | three!($a, $b);
73+
LL | three!($a, $b);
7474
| ^^
7575
...
76-
50 | two!("yay", "rust");
76+
LL | two!("yay", "rust");
7777
| -------------------- in this macro invocation
7878

7979
error: first parent: "yay"
8080
--> $DIR/parent-source-spans.rs:50:5
8181
|
82-
50 | two!("yay", "rust");
82+
LL | two!("yay", "rust");
8383
| ^^^^^^^^^^^^^^^^^^^^
8484

8585
error: second parent: "rust"
8686
--> $DIR/parent-source-spans.rs:50:5
8787
|
88-
50 | two!("yay", "rust");
88+
LL | two!("yay", "rust");
8989
| ^^^^^^^^^^^^^^^^^^^^
9090

9191
error: first source: "yay"
9292
--> $DIR/parent-source-spans.rs:50:5
9393
|
94-
50 | two!("yay", "rust");
94+
LL | two!("yay", "rust");
9595
| ^^^^^^^^^^^^^^^^^^^^
9696

9797
error: second source: "rust"
9898
--> $DIR/parent-source-spans.rs:50:5
9999
|
100-
50 | two!("yay", "rust");
100+
LL | two!("yay", "rust");
101101
| ^^^^^^^^^^^^^^^^^^^^
102102

103103
error: first final: "hip"
104104
--> $DIR/parent-source-spans.rs:56:12
105105
|
106-
56 | three!("hip", "hop");
106+
LL | three!("hip", "hop");
107107
| ^^^^^
108108

109109
error: second final: "hop"
110110
--> $DIR/parent-source-spans.rs:56:19
111111
|
112-
56 | three!("hip", "hop");
112+
LL | three!("hip", "hop");
113113
| ^^^^^
114114

115115
error: first source: "hip"
116116
--> $DIR/parent-source-spans.rs:56:12
117117
|
118-
56 | three!("hip", "hop");
118+
LL | three!("hip", "hop");
119119
| ^^^^^
120120

121121
error: second source: "hop"
122122
--> $DIR/parent-source-spans.rs:56:19
123123
|
124-
56 | three!("hip", "hop");
124+
LL | three!("hip", "hop");
125125
| ^^^^^
126126

127127
error: aborting due to 18 previous errors

‎src/test/ui-fulldeps/proc-macro/signature.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error[E0308]: mismatched types
22
--> $DIR/signature.rs:17:1
33
|
4-
17 | / pub unsafe extern fn foo(a: i32, b: u32) -> u32 {
5-
18 | | //~^ ERROR: mismatched types
6-
19 | | loop {}
7-
20 | | }
4+
LL | / pub unsafe extern fn foo(a: i32, b: u32) -> u32 {
5+
LL | | //~^ ERROR: mismatched types
6+
LL | | loop {}
7+
LL | | }
88
| |_^ expected normal fn, found unsafe fn
99
|
1010
= note: expected type `fn(proc_macro::TokenStream) -> proc_macro::TokenStream`

‎src/test/ui-fulldeps/proc-macro/three-equals.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
error: found 2 equal signs, need exactly 3
22
--> $DIR/three-equals.rs:25:5
33
|
4-
25 | three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3
4+
LL | three_equals!(==); //~ ERROR found 2 equal signs, need exactly 3
55
| ^^^^^^^^^^^^^^^^^^
66
|
77
= help: input must be: `===`
88

99
error: expected EOF, found `=`.
1010
--> $DIR/three-equals.rs:28:21
1111
|
12-
28 | three_equals!(=====); //~ ERROR expected EOF
12+
LL | three_equals!(=====); //~ ERROR expected EOF
1313
| ^^
1414
|
1515
note: last good input was here
1616
--> $DIR/three-equals.rs:28:21
1717
|
18-
28 | three_equals!(=====); //~ ERROR expected EOF
18+
LL | three_equals!(=====); //~ ERROR expected EOF
1919
| ^^
2020
= help: input must be: `===`
2121

2222
error: expected `=`, found `abc`.
2323
--> $DIR/three-equals.rs:31:19
2424
|
25-
31 | three_equals!(abc); //~ ERROR expected `=`
25+
LL | three_equals!(abc); //~ ERROR expected `=`
2626
| ^^^
2727

2828
error: expected `=`, found `!`.
2929
--> $DIR/three-equals.rs:34:19
3030
|
31-
34 | three_equals!(!!); //~ ERROR expected `=`
31+
LL | three_equals!(!!); //~ ERROR expected `=`
3232
| ^
3333

3434
error: expected EOF, found `a`.
3535
--> $DIR/three-equals.rs:37:22
3636
|
37-
37 | three_equals!(===a); //~ ERROR expected EOF
37+
LL | three_equals!(===a); //~ ERROR expected EOF
3838
| ^
3939
|
4040
note: last good input was here
4141
--> $DIR/three-equals.rs:37:21
4242
|
43-
37 | three_equals!(===a); //~ ERROR expected EOF
43+
LL | three_equals!(===a); //~ ERROR expected EOF
4444
| ^
4545
= help: input must be: `===`
4646

‎src/test/ui-fulldeps/resolve-error.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
error: cannot find derive macro `FooWithLongNan` in this scope
22
--> $DIR/resolve-error.rs:37:10
33
|
4-
37 | #[derive(FooWithLongNan)]
4+
LL | #[derive(FooWithLongNan)]
55
| ^^^^^^^^^^^^^^ help: try: `FooWithLongName`
66

77
error: cannot find attribute macro `attr_proc_macra` in this scope
88
--> $DIR/resolve-error.rs:41:3
99
|
10-
41 | #[attr_proc_macra]
10+
LL | #[attr_proc_macra]
1111
| ^^^^^^^^^^^^^^^ help: try: `attr_proc_macro`
1212

1313
error: cannot find attribute macro `FooWithLongNan` in this scope
1414
--> $DIR/resolve-error.rs:45:3
1515
|
16-
45 | #[FooWithLongNan]
16+
LL | #[FooWithLongNan]
1717
| ^^^^^^^^^^^^^^
1818

1919
error: cannot find derive macro `Dlone` in this scope
2020
--> $DIR/resolve-error.rs:49:10
2121
|
22-
49 | #[derive(Dlone)]
22+
LL | #[derive(Dlone)]
2323
| ^^^^^ help: try: `Clone`
2424

2525
error: cannot find derive macro `Dlona` in this scope
2626
--> $DIR/resolve-error.rs:53:10
2727
|
28-
53 | #[derive(Dlona)]
28+
LL | #[derive(Dlona)]
2929
| ^^^^^ help: try: `Clona`
3030

3131
error: cannot find derive macro `attr_proc_macra` in this scope
3232
--> $DIR/resolve-error.rs:57:10
3333
|
34-
57 | #[derive(attr_proc_macra)]
34+
LL | #[derive(attr_proc_macra)]
3535
| ^^^^^^^^^^^^^^^
3636

3737
error: cannot find macro `FooWithLongNama!` in this scope
3838
--> $DIR/resolve-error.rs:62:5
3939
|
40-
62 | FooWithLongNama!();
40+
LL | FooWithLongNama!();
4141
| ^^^^^^^^^^^^^^^ help: you could try the macro: `FooWithLongNam`
4242

4343
error: cannot find macro `attr_proc_macra!` in this scope
4444
--> $DIR/resolve-error.rs:65:5
4545
|
46-
65 | attr_proc_macra!();
46+
LL | attr_proc_macra!();
4747
| ^^^^^^^^^^^^^^^ help: you could try the macro: `attr_proc_mac`
4848

4949
error: cannot find macro `Dlona!` in this scope
5050
--> $DIR/resolve-error.rs:68:5
5151
|
52-
68 | Dlona!();
52+
LL | Dlona!();
5353
| ^^^^^
5454

5555
error: cannot find macro `bang_proc_macrp!` in this scope
5656
--> $DIR/resolve-error.rs:71:5
5757
|
58-
71 | bang_proc_macrp!();
58+
LL | bang_proc_macrp!();
5959
| ^^^^^^^^^^^^^^^ help: you could try the macro: `bang_proc_macro`
6060

6161
error: aborting due to 10 previous errors

0 commit comments

Comments
 (0)