Skip to content

Commit 5d2f508

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#132780
Rollup merge of rust-lang#132780 - compiler-errors:verbose, r=estebank use verbose for path separator suggestion A single `-` of suggestion underlining that is adjacent to a much more significant `^^^` underlying of the LHS path component is hard to distinguish. IMO this presents much more cleanly when it's verbose, especially because it's a *replacment* suggestion. r? estebank
2 parents 012ae13 + 0e481b4 commit 5d2f508

6 files changed

+104
-19
lines changed

‎compiler/rustc_resolve/src/late/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ impl<'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
14721472
};
14731473

14741474
if lhs_span.eq_ctxt(rhs_span) {
1475-
err.span_suggestion(
1475+
err.span_suggestion_verbose(
14761476
lhs_span.between(rhs_span),
14771477
MESSAGE,
14781478
"::",

‎tests/ui/resolve/issue-100365.stderr

+23-4
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,34 @@ error[E0423]: expected value, found trait `Into`
22
--> $DIR/issue-100365.rs:2:16
33
|
44
LL | let addr = Into::<std::net::IpAddr>.into([127, 0, 0, 1]);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^- help: use the path separator to refer to an item: `::`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
help: use the path separator to refer to an item
8+
|
9+
LL | let addr = Into::<std::net::IpAddr>::into([127, 0, 0, 1]);
10+
| ~~
611

712
error[E0423]: expected value, found trait `Into`
813
--> $DIR/issue-100365.rs:6:13
914
|
1015
LL | let _ = Into.into(());
11-
| ^^^^- help: use the path separator to refer to an item: `::`
16+
| ^^^^
17+
|
18+
help: use the path separator to refer to an item
19+
|
20+
LL | let _ = Into::into(());
21+
| ~~
1222

1323
error[E0423]: expected value, found trait `Into`
1424
--> $DIR/issue-100365.rs:10:13
1525
|
1626
LL | let _ = Into::<()>.into;
17-
| ^^^^^^^^^^- help: use the path separator to refer to an item: `::`
27+
| ^^^^^^^^^^
28+
|
29+
help: use the path separator to refer to an item
30+
|
31+
LL | let _ = Into::<()>::into;
32+
| ~~
1833

1934
error[E0423]: expected value, found trait `std::iter::Iterator`
2035
--> $DIR/issue-100365.rs:17:9
@@ -42,12 +57,16 @@ error[E0423]: expected value, found trait `Into`
4257
--> $DIR/issue-100365.rs:25:9
4358
|
4459
LL | Into::<String>.into("")
45-
| ^^^^^^^^^^^^^^- help: use the path separator to refer to an item: `::`
60+
| ^^^^^^^^^^^^^^
4661
...
4762
LL | let _ = create!();
4863
| --------- in this macro invocation
4964
|
5065
= note: this error originates in the macro `create` (in Nightly builds, run with -Z macro-backtrace for more info)
66+
help: use the path separator to refer to an item
67+
|
68+
LL | Into::<String>::into("")
69+
| ~~
5170

5271
error: aborting due to 6 previous errors
5372

‎tests/ui/resolve/issue-22692.stderr

+28-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,34 @@ error[E0423]: expected value, found struct `String`
22
--> $DIR/issue-22692.rs:2:13
33
|
44
LL | let _ = String.new();
5-
| ^^^^^^- help: use the path separator to refer to an item: `::`
5+
| ^^^^^^
6+
|
7+
help: use the path separator to refer to an item
8+
|
9+
LL | let _ = String::new();
10+
| ~~
611

712
error[E0423]: expected value, found struct `String`
813
--> $DIR/issue-22692.rs:6:13
914
|
1015
LL | let _ = String.default;
11-
| ^^^^^^- help: use the path separator to refer to an item: `::`
16+
| ^^^^^^
17+
|
18+
help: use the path separator to refer to an item
19+
|
20+
LL | let _ = String::default;
21+
| ~~
1222

1323
error[E0423]: expected value, found struct `Vec`
1424
--> $DIR/issue-22692.rs:10:13
1525
|
1626
LL | let _ = Vec::<()>.with_capacity(1);
17-
| ^^^^^^^^^- help: use the path separator to refer to an item: `::`
27+
| ^^^^^^^^^
28+
|
29+
help: use the path separator to refer to an item
30+
|
31+
LL | let _ = Vec::<()>::with_capacity(1);
32+
| ~~
1833

1934
error[E0423]: expected value, found struct `std::cell::Cell`
2035
--> $DIR/issue-22692.rs:17:9
@@ -50,23 +65,31 @@ error[E0423]: expected value, found struct `Vec`
5065
--> $DIR/issue-22692.rs:26:9
5166
|
5267
LL | Vec.new()
53-
| ^^^- help: use the path separator to refer to an item: `::`
68+
| ^^^
5469
...
5570
LL | let _ = create!(type method);
5671
| -------------------- in this macro invocation
5772
|
5873
= note: this error originates in the macro `create` (in Nightly builds, run with -Z macro-backtrace for more info)
74+
help: use the path separator to refer to an item
75+
|
76+
LL | Vec::new()
77+
| ~~
5978

6079
error[E0423]: expected value, found struct `Vec`
6180
--> $DIR/issue-22692.rs:31:9
6281
|
6382
LL | Vec.new
64-
| ^^^- help: use the path separator to refer to an item: `::`
83+
| ^^^
6584
...
6685
LL | let _ = create!(type field);
6786
| ------------------- in this macro invocation
6887
|
6988
= note: this error originates in the macro `create` (in Nightly builds, run with -Z macro-backtrace for more info)
89+
help: use the path separator to refer to an item
90+
|
91+
LL | Vec::new
92+
| ~~
7093

7194
error[E0423]: expected value, found struct `std::cell::Cell`
7295
--> $DIR/issue-22692.rs:17:9

‎tests/ui/resolve/suggest-path-for-tuple-struct.stderr

+12-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,23 @@ error[E0423]: expected value, found struct `SomeTupleStruct`
22
--> $DIR/suggest-path-for-tuple-struct.rs:22:13
33
|
44
LL | let _ = SomeTupleStruct.new();
5-
| ^^^^^^^^^^^^^^^- help: use the path separator to refer to an item: `::`
5+
| ^^^^^^^^^^^^^^^
6+
|
7+
help: use the path separator to refer to an item
8+
|
9+
LL | let _ = SomeTupleStruct::new();
10+
| ~~
611

712
error[E0423]: expected value, found struct `SomeRegularStruct`
813
--> $DIR/suggest-path-for-tuple-struct.rs:24:13
914
|
1015
LL | let _ = SomeRegularStruct.new();
11-
| ^^^^^^^^^^^^^^^^^- help: use the path separator to refer to an item: `::`
16+
| ^^^^^^^^^^^^^^^^^
17+
|
18+
help: use the path separator to refer to an item
19+
|
20+
LL | let _ = SomeRegularStruct::new();
21+
| ~~
1222

1323
error: aborting due to 2 previous errors
1424

‎tests/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr

+34-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,34 @@ error[E0423]: expected value, found module `a`
22
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:17:5
33
|
44
LL | a.I
5-
| ^- help: use the path separator to refer to an item: `::`
5+
| ^
6+
|
7+
help: use the path separator to refer to an item
8+
|
9+
LL | a::I
10+
| ~~
611

712
error[E0423]: expected value, found module `a`
813
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:23:5
914
|
1015
LL | a.g()
11-
| ^- help: use the path separator to refer to an item: `::`
16+
| ^
17+
|
18+
help: use the path separator to refer to an item
19+
|
20+
LL | a::g()
21+
| ~~
1222

1323
error[E0423]: expected value, found module `a`
1424
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:29:5
1525
|
1626
LL | a.b.J
17-
| ^- help: use the path separator to refer to an item: `::`
27+
| ^
28+
|
29+
help: use the path separator to refer to an item
30+
|
31+
LL | a::b.J
32+
| ~~
1833

1934
error[E0423]: expected value, found module `a::b`
2035
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:35:5
@@ -38,7 +53,12 @@ error[E0423]: expected value, found module `a`
3853
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:42:5
3954
|
4055
LL | a.b.f();
41-
| ^- help: use the path separator to refer to an item: `::`
56+
| ^
57+
|
58+
help: use the path separator to refer to an item
59+
|
60+
LL | a::b.f();
61+
| ~~
4262

4363
error[E0423]: expected value, found module `a::b`
4464
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:46:12
@@ -117,23 +137,31 @@ error[E0423]: expected value, found module `a`
117137
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:80:9
118138
|
119139
LL | a.f()
120-
| ^- help: use the path separator to refer to an item: `::`
140+
| ^
121141
...
122142
LL | let _ = create!(method);
123143
| --------------- in this macro invocation
124144
|
125145
= note: this error originates in the macro `create` (in Nightly builds, run with -Z macro-backtrace for more info)
146+
help: use the path separator to refer to an item
147+
|
148+
LL | a::f()
149+
| ~~
126150

127151
error[E0423]: expected value, found module `a`
128152
--> $DIR/suggest-path-instead-of-mod-dot-item.rs:85:9
129153
|
130154
LL | a.f
131-
| ^- help: use the path separator to refer to an item: `::`
155+
| ^
132156
...
133157
LL | let _ = create!(field);
134158
| -------------- in this macro invocation
135159
|
136160
= note: this error originates in the macro `create` (in Nightly builds, run with -Z macro-backtrace for more info)
161+
help: use the path separator to refer to an item
162+
|
163+
LL | a::f
164+
| ~~
137165

138166
error: aborting due to 13 previous errors
139167

‎tests/ui/suggestions/assoc-const-as-field.stderr

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ error[E0423]: expected value, found struct `Mod::Foo`
22
--> $DIR/assoc-const-as-field.rs:11:9
33
|
44
LL | foo(Mod::Foo.Bar);
5-
| ^^^^^^^^- help: use the path separator to refer to an item: `::`
5+
| ^^^^^^^^
6+
|
7+
help: use the path separator to refer to an item
8+
|
9+
LL | foo(Mod::Foo::Bar);
10+
| ~~
611

712
error: aborting due to 1 previous error
813

0 commit comments

Comments
 (0)