Skip to content

Commit 8add02a

Browse files
oli-obkoli-obk
committed
Changes in ui tests
1 parent e328ef0 commit 8add02a

7 files changed

+54
-77
lines changed

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

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ error[E0412]: cannot find type `Apple` in this scope
22
--> $DIR/issue-35675.rs:20:29
33
|
44
20 | fn should_return_fruit() -> Apple {
5-
| ^^^^^ not found in this scope
6-
|
7-
help: there is an enum variant `Fruit::Apple`, did you mean to use `Fruit`?
8-
--> $DIR/issue-35675.rs:14:5
9-
|
10-
14 | Apple(i64),
11-
| ^^^^^^^^^^
5+
| ^^^^^
6+
| |
7+
| not found in this scope
8+
| help: did you mean the variant's enum `Fruit`
129

1310
error[E0425]: cannot find function `Apple` in this scope
1411
--> $DIR/issue-35675.rs:23:5
@@ -23,13 +20,10 @@ error[E0573]: expected type, found variant `Fruit::Apple`
2320
--> $DIR/issue-35675.rs:28:33
2421
|
2522
28 | fn should_return_fruit_too() -> Fruit::Apple {
26-
| ^^^^^^^^^^^^ not a type
27-
|
28-
help: there is an enum variant `Fruit::Apple`, did you mean to use `Fruit`?
29-
--> $DIR/issue-35675.rs:14:5
30-
|
31-
14 | Apple(i64),
32-
| ^^^^^^^^^^
23+
| ^^^^^^^^^^^^
24+
| |
25+
| not a type
26+
| help: did you mean the variant's enum `Fruit`
3327

3428
error[E0425]: cannot find function `Apple` in this scope
3529
--> $DIR/issue-35675.rs:31:5
@@ -46,29 +40,26 @@ error[E0573]: expected type, found variant `Ok`
4640
36 | fn foo() -> Ok {
4741
| ^^ not a type
4842
|
49-
= help: there is an enum variant `std::prelude::v1::Ok`, did you mean to use `std::prelude::v1`?
50-
= help: there is an enum variant `std::prelude::v1::Result::Ok`, did you mean to use `std::prelude::v1::Result`?
43+
= help: there is an enum variant `std::prelude::v1::Ok`,did you mean to use `std::prelude::v1`?
44+
= help: there is an enum variant `std::prelude::v1::Result::Ok`,did you mean to use `std::prelude::v1::Result`?
5145

5246
error[E0412]: cannot find type `Variant3` in this scope
5347
--> $DIR/issue-35675.rs:44:13
5448
|
5549
44 | fn bar() -> Variant3 {
56-
| ^^^^^^^^ not found in this scope
57-
|
58-
help: there is an enum variant `x::Enum::Variant3`, did you mean to use `x::Enum`?
59-
--> $DIR/issue-35675.rs:63:9
60-
|
61-
63 | Variant3(usize),
62-
| ^^^^^^^^^^^^^^^
50+
| ^^^^^^^^
51+
| |
52+
| not found in this scope
53+
| help: did you mean the variant's enum `x::Enum`
6354

6455
error[E0573]: expected type, found variant `Some`
6556
--> $DIR/issue-35675.rs:49:13
6657
|
6758
49 | fn qux() -> Some {
6859
| ^^^^ not a type
6960
|
70-
= help: there is an enum variant `std::option::Option::Some`, did you mean to use `std::option::Option`?
71-
= help: there is an enum variant `std::prelude::v1::Some`, did you mean to use `std::prelude::v1`?
61+
= help: there is an enum variant `std::option::Option::Some`,did you mean to use `std::option::Option`?
62+
= help: there is an enum variant `std::prelude::v1::Some`,did you mean to use `std::prelude::v1`?
7263

7364
error: aborting due to 7 previous errors
7465

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@ error: cannot find derive macro `FooWithLongNan` in this scope
22
--> $DIR/resolve-error.rs:36:10
33
|
44
36 | #[derive(FooWithLongNan)]
5-
| ^^^^^^^^^^^^^^
6-
|
7-
= help: did you mean `FooWithLongName`?
5+
| ^^^^^^^^^^^^^^ help: did you mean `FooWithLongName`
86

97
error: cannot find attribute macro `attr_proc_macra` in this scope
108
--> $DIR/resolve-error.rs:39:3
119
|
1210
39 | #[attr_proc_macra]
13-
| ^^^^^^^^^^^^^^^
14-
|
15-
= help: did you mean `attr_proc_macro`?
11+
| ^^^^^^^^^^^^^^^ help: did you mean `attr_proc_macro`
1612

1713
error: cannot find attribute macro `FooWithLongNan` in this scope
1814
--> $DIR/resolve-error.rs:42:3
@@ -24,17 +20,13 @@ error: cannot find derive macro `Dlone` in this scope
2420
--> $DIR/resolve-error.rs:45:10
2521
|
2622
45 | #[derive(Dlone)]
27-
| ^^^^^
28-
|
29-
= help: did you mean `Clone`?
23+
| ^^^^^ help: did you mean `Clone`
3024

3125
error: cannot find derive macro `Dlona` in this scope
3226
--> $DIR/resolve-error.rs:48:10
3327
|
3428
48 | #[derive(Dlona)]
35-
| ^^^^^
36-
|
37-
= help: did you mean `Clona`?
29+
| ^^^^^ help: did you mean `Clona`
3830

3931
error: cannot find derive macro `attr_proc_macra` in this scope
4032
--> $DIR/resolve-error.rs:51:10
@@ -46,17 +38,13 @@ error: cannot find macro `FooWithLongNama!` in this scope
4638
--> $DIR/resolve-error.rs:55:5
4739
|
4840
55 | FooWithLongNama!();
49-
| ^^^^^^^^^^^^^^^
50-
|
51-
= help: did you mean `FooWithLongNam!`?
41+
| ^^^^^^^^^^^^^^^ help: did you mean `FooWithLongNam!`
5242

5343
error: cannot find macro `attr_proc_macra!` in this scope
5444
--> $DIR/resolve-error.rs:57:5
5545
|
5646
57 | attr_proc_macra!();
57-
| ^^^^^^^^^^^^^^^
58-
|
59-
= help: did you mean `attr_proc_mac!`?
47+
| ^^^^^^^^^^^^^^^ help: did you mean `attr_proc_mac!`
6048

6149
error: cannot find macro `Dlona!` in this scope
6250
--> $DIR/resolve-error.rs:59:5
@@ -68,9 +56,7 @@ error: cannot find macro `bang_proc_macrp!` in this scope
6856
--> $DIR/resolve-error.rs:61:5
6957
|
7058
61 | bang_proc_macrp!();
71-
| ^^^^^^^^^^^^^^^
72-
|
73-
= help: did you mean `bang_proc_macro!`?
59+
| ^^^^^^^^^^^^^^^ help: did you mean `bang_proc_macro!`
7460

7561
error: aborting due to 10 previous errors
7662

‎src/test/ui/resolve/issue-14254.stderr

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0425]: cannot find function `baz` in this scope
22
--> $DIR/issue-14254.rs:29:9
33
|
44
29 | baz();
5-
| ^^^ did you mean `self.baz(...)`?
5+
| ^^^ help: did you mean `self.baz`
66

77
error[E0425]: cannot find value `a` in this scope
88
--> $DIR/issue-14254.rs:32:9
@@ -14,19 +14,19 @@ error[E0425]: cannot find function `baz` in this scope
1414
--> $DIR/issue-14254.rs:40:9
1515
|
1616
40 | baz();
17-
| ^^^ did you mean `self.baz(...)`?
17+
| ^^^ help: did you mean `self.baz`
1818

1919
error[E0425]: cannot find value `x` in this scope
2020
--> $DIR/issue-14254.rs:43:9
2121
|
2222
43 | x;
23-
| ^ did you mean `self.x`?
23+
| ^ help: did you mean `self.x`
2424

2525
error[E0425]: cannot find value `y` in this scope
2626
--> $DIR/issue-14254.rs:46:9
2727
|
2828
46 | y;
29-
| ^ did you mean `self.y`?
29+
| ^ help: did you mean `self.y`
3030

3131
error[E0425]: cannot find value `a` in this scope
3232
--> $DIR/issue-14254.rs:49:9
@@ -38,7 +38,7 @@ error[E0425]: cannot find value `bah` in this scope
3838
--> $DIR/issue-14254.rs:52:9
3939
|
4040
52 | bah;
41-
| ^^^ did you mean `Self::bah`?
41+
| ^^^ help: did you mean `Self::bah`
4242

4343
error[E0425]: cannot find value `b` in this scope
4444
--> $DIR/issue-14254.rs:55:9
@@ -50,19 +50,19 @@ error[E0425]: cannot find function `baz` in this scope
5050
--> $DIR/issue-14254.rs:63:9
5151
|
5252
63 | baz();
53-
| ^^^ did you mean `self.baz(...)`?
53+
| ^^^ help: did you mean `self.baz`
5454

5555
error[E0425]: cannot find value `x` in this scope
5656
--> $DIR/issue-14254.rs:66:9
5757
|
5858
66 | x;
59-
| ^ did you mean `self.x`?
59+
| ^ help: did you mean `self.x`
6060

6161
error[E0425]: cannot find value `y` in this scope
6262
--> $DIR/issue-14254.rs:69:9
6363
|
6464
69 | y;
65-
| ^ did you mean `self.y`?
65+
| ^ help: did you mean `self.y`
6666

6767
error[E0425]: cannot find value `a` in this scope
6868
--> $DIR/issue-14254.rs:72:9
@@ -74,7 +74,7 @@ error[E0425]: cannot find value `bah` in this scope
7474
--> $DIR/issue-14254.rs:75:9
7575
|
7676
75 | bah;
77-
| ^^^ did you mean `Self::bah`?
77+
| ^^^ help: did you mean `Self::bah`
7878

7979
error[E0425]: cannot find value `b` in this scope
8080
--> $DIR/issue-14254.rs:78:9
@@ -86,61 +86,61 @@ error[E0425]: cannot find function `baz` in this scope
8686
--> $DIR/issue-14254.rs:86:9
8787
|
8888
86 | baz();
89-
| ^^^ did you mean `self.baz(...)`?
89+
| ^^^ help: did you mean `self.baz`
9090

9191
error[E0425]: cannot find value `bah` in this scope
9292
--> $DIR/issue-14254.rs:89:9
9393
|
9494
89 | bah;
95-
| ^^^ did you mean `Self::bah`?
95+
| ^^^ help: did you mean `Self::bah`
9696

9797
error[E0425]: cannot find function `baz` in this scope
9898
--> $DIR/issue-14254.rs:97:9
9999
|
100100
97 | baz();
101-
| ^^^ did you mean `self.baz(...)`?
101+
| ^^^ help: did you mean `self.baz`
102102

103103
error[E0425]: cannot find value `bah` in this scope
104104
--> $DIR/issue-14254.rs:100:9
105105
|
106106
100 | bah;
107-
| ^^^ did you mean `Self::bah`?
107+
| ^^^ help: did you mean `Self::bah`
108108

109109
error[E0425]: cannot find function `baz` in this scope
110110
--> $DIR/issue-14254.rs:108:9
111111
|
112112
108 | baz();
113-
| ^^^ did you mean `self.baz(...)`?
113+
| ^^^ help: did you mean `self.baz`
114114

115115
error[E0425]: cannot find value `bah` in this scope
116116
--> $DIR/issue-14254.rs:111:9
117117
|
118118
111 | bah;
119-
| ^^^ did you mean `Self::bah`?
119+
| ^^^ help: did you mean `Self::bah`
120120

121121
error[E0425]: cannot find function `baz` in this scope
122122
--> $DIR/issue-14254.rs:119:9
123123
|
124124
119 | baz();
125-
| ^^^ did you mean `self.baz(...)`?
125+
| ^^^ help: did you mean `self.baz`
126126

127127
error[E0425]: cannot find value `bah` in this scope
128128
--> $DIR/issue-14254.rs:122:9
129129
|
130130
122 | bah;
131-
| ^^^ did you mean `Self::bah`?
131+
| ^^^ help: did you mean `Self::bah`
132132

133133
error[E0425]: cannot find function `baz` in this scope
134134
--> $DIR/issue-14254.rs:130:9
135135
|
136136
130 | baz();
137-
| ^^^ did you mean `self.baz(...)`?
137+
| ^^^ help: did you mean `self.baz`
138138

139139
error[E0425]: cannot find value `bah` in this scope
140140
--> $DIR/issue-14254.rs:133:9
141141
|
142142
133 | bah;
143-
| ^^^ did you mean `Self::bah`?
143+
| ^^^ help: did you mean `Self::bah`
144144

145145
error: main function not found
146146

‎src/test/ui/resolve/issue-2356.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ error[E0425]: cannot find function `clone` in this scope
88
--> $DIR/issue-2356.rs:35:5
99
|
1010
35 | clone();
11-
| ^^^^^ did you mean `self.clone(...)`?
11+
| ^^^^^ help: did you mean `self.clone`
1212

1313
error[E0425]: cannot find function `default` in this scope
1414
--> $DIR/issue-2356.rs:43:5
1515
|
1616
43 | default();
17-
| ^^^^^^^ did you mean `Self::default`?
17+
| ^^^^^^^ help: did you mean `Self::default`
1818

1919
error[E0425]: cannot find value `whiskers` in this scope
2020
--> $DIR/issue-2356.rs:52:5
2121
|
2222
52 | whiskers -= other;
2323
| ^^^^^^^^
2424
| |
25-
| did you mean `self.whiskers`?
25+
| help: did you mean `self.whiskers`
2626
| `self` value is only available in methods with `self` parameter
2727

2828
error[E0425]: cannot find function `shave` in this scope
2929
--> $DIR/issue-2356.rs:57:5
3030
|
3131
57 | shave(4);
32-
| ^^^^^ did you mean `Self::shave`?
32+
| ^^^^^ help: did you mean `Self::shave`
3333

3434
error[E0425]: cannot find function `purr` in this scope
3535
--> $DIR/issue-2356.rs:60:5
@@ -83,15 +83,15 @@ error[E0425]: cannot find value `whiskers` in this scope
8383
--> $DIR/issue-2356.rs:104:5
8484
|
8585
104 | whiskers = 0;
86-
| ^^^^^^^^ did you mean `self.whiskers`?
86+
| ^^^^^^^^ help: did you mean `self.whiskers`
8787

8888
error[E0425]: cannot find value `whiskers` in this scope
8989
--> $DIR/issue-2356.rs:110:5
9090
|
9191
110 | whiskers = 4;
9292
| ^^^^^^^^
9393
| |
94-
| did you mean `self.whiskers`?
94+
| help: did you mean `self.whiskers`
9595
| `self` value is only available in methods with `self` parameter
9696

9797
error[E0425]: cannot find function `purr_louder` in this scope

‎src/test/ui/resolve/resolve-assoc-suggestions.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ error[E0425]: cannot find value `field` in this scope
1414
--> $DIR/resolve-assoc-suggestions.rs:32:9
1515
|
1616
32 | field;
17-
| ^^^^^ did you mean `self.field`?
17+
| ^^^^^ help: did you mean `self.field`
1818

1919
error[E0412]: cannot find type `Type` in this scope
2020
--> $DIR/resolve-assoc-suggestions.rs:36:16
2121
|
2222
36 | let _: Type;
23-
| ^^^^ did you mean `Self::Type`?
23+
| ^^^^ help: did you mean `Self::Type`
2424

2525
error[E0531]: cannot find tuple struct/variant `Type` in this scope
2626
--> $DIR/resolve-assoc-suggestions.rs:39:13
@@ -50,7 +50,7 @@ error[E0425]: cannot find value `method` in this scope
5050
--> $DIR/resolve-assoc-suggestions.rs:52:9
5151
|
5252
52 | method;
53-
| ^^^^^^ did you mean `self.method(...)`?
53+
| ^^^^^^ help: did you mean `self.method`
5454

5555
error: aborting due to 9 previous errors
5656

‎src/test/ui/resolve/resolve-speculative-adjustment.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ error[E0425]: cannot find value `field` in this scope
1414
--> $DIR/resolve-speculative-adjustment.rs:35:9
1515
|
1616
35 | field;
17-
| ^^^^^ did you mean `self.field`?
17+
| ^^^^^ help: did you mean `self.field`
1818

1919
error[E0425]: cannot find function `method` in this scope
2020
--> $DIR/resolve-speculative-adjustment.rs:38:9
2121
|
2222
38 | method();
23-
| ^^^^^^ did you mean `self.method(...)`?
23+
| ^^^^^^ help: did you mean `self.method`
2424

2525
error: aborting due to 4 previous errors
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0425]: cannot find value `cx` in this scope
44
19 | f(cx);
55
| ^^
66
| |
7-
| did you mean `self.cx`?
7+
| help: did you mean `self.cx`
88
| `self` value is only available in methods with `self` parameter
99

1010
error: aborting due to previous error

0 commit comments

Comments
 (0)