Skip to content

Commit 4435bb0

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #91981 - estebank:tweakaroo, r=lcnr
Recover suggestions and useful information lost in previous PR Follow up to #91898.
2 parents 551b4fa + f479e26 commit 4435bb0

Some content is hidden

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

41 files changed

+209
-60
lines changed

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@ pub fn same_type_modulo_infer<'tcx>(a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
333333
)
334334
| (&ty::Infer(ty::InferTy::TyVar(_)), _)
335335
| (_, &ty::Infer(ty::InferTy::TyVar(_))) => true,
336+
(&ty::Ref(reg_a, ty_a, mut_a), &ty::Ref(reg_b, ty_b, mut_b)) => {
337+
reg_a == reg_b && mut_a == mut_b && same_type_modulo_infer(*ty_a, *ty_b)
338+
}
336339
_ => a == b,
337340
}
338341
}
@@ -602,7 +605,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
602605
match *cause.code() {
603606
ObligationCauseCode::Pattern { origin_expr: true, span: Some(span), root_ty } => {
604607
let ty = self.resolve_vars_if_possible(root_ty);
605-
if ty.is_suggestable() {
608+
if !matches!(ty.kind(), ty::Infer(ty::InferTy::TyVar(_) | ty::InferTy::FreshTy(_)))
609+
{
606610
// don't show type `_`
607611
err.span_label(span, format!("this expression has type `{}`", ty));
608612
}

‎compiler/rustc_infer/src/infer/mod.rs

+31
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,17 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
14341434
value.fold_with(&mut r)
14351435
}
14361436

1437+
pub fn resolve_numeric_literals_with_default<T>(&self, value: T) -> T
1438+
where
1439+
T: TypeFoldable<'tcx>,
1440+
{
1441+
if !value.needs_infer() {
1442+
return value; // Avoid duplicated subst-folding.
1443+
}
1444+
let mut r = InferenceLiteralEraser { tcx: self.tcx };
1445+
value.fold_with(&mut r)
1446+
}
1447+
14371448
/// Returns the first unresolved variable contained in `T`. In the
14381449
/// process of visiting `T`, this will resolve (where possible)
14391450
/// type variables in `T`, but it never constructs the final,
@@ -1785,6 +1796,26 @@ impl<'tcx> TyOrConstInferVar<'tcx> {
17851796
}
17861797
}
17871798

1799+
/// Replace `{integer}` with `i32` and `{float}` with `f64`.
1800+
/// Used only for diagnostics.
1801+
struct InferenceLiteralEraser<'tcx> {
1802+
tcx: TyCtxt<'tcx>,
1803+
}
1804+
1805+
impl<'tcx> TypeFolder<'tcx> for InferenceLiteralEraser<'tcx> {
1806+
fn tcx(&self) -> TyCtxt<'tcx> {
1807+
self.tcx
1808+
}
1809+
1810+
fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
1811+
match ty.kind() {
1812+
ty::Infer(ty::IntVar(_) | ty::FreshIntTy(_)) => self.tcx.types.i32,
1813+
ty::Infer(ty::FloatVar(_) | ty::FreshFloatTy(_)) => self.tcx.types.f64,
1814+
_ => ty.super_fold_with(self),
1815+
}
1816+
}
1817+
}
1818+
17881819
struct ShallowResolver<'a, 'tcx> {
17891820
infcx: &'a InferCtxt<'a, 'tcx>,
17901821
}

‎compiler/rustc_typeck/src/astconv/generics.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_hir as hir;
1111
use rustc_hir::def::{DefKind, Res};
1212
use rustc_hir::def_id::DefId;
1313
use rustc_hir::GenericArg;
14+
use rustc_infer::infer::TyCtxtInferExt;
1415
use rustc_middle::ty::{
1516
self, subst, subst::SubstsRef, GenericParamDef, GenericParamDefKind, Ty, TyCtxt,
1617
};
@@ -83,7 +84,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
8384
if let Some(param_local_id) = param.def_id.as_local() {
8485
let param_hir_id = tcx.hir().local_def_id_to_hir_id(param_local_id);
8586
let param_name = tcx.hir().ty_param_name(param_hir_id);
86-
let param_type = tcx.type_of(param.def_id);
87+
let param_type = tcx.infer_ctxt().enter(|infcx| {
88+
infcx.resolve_numeric_literals_with_default(tcx.type_of(param.def_id))
89+
});
8790
if param_type.is_suggestable() {
8891
err.span_suggestion(
8992
tcx.def_span(src_def_id),

‎compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs

+11-2
Original file line numberDiff line numberDiff line change
@@ -521,20 +521,29 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
521521
can_suggest: bool,
522522
fn_id: hir::HirId,
523523
) -> bool {
524+
let found =
525+
self.resolve_numeric_literals_with_default(self.resolve_vars_if_possible(found));
524526
// Only suggest changing the return type for methods that
525527
// haven't set a return type at all (and aren't `fn main()` or an impl).
526528
match (&fn_decl.output, found.is_suggestable(), can_suggest, expected.is_unit()) {
527529
(&hir::FnRetTy::DefaultReturn(span), true, true, true) => {
528530
err.span_suggestion(
529531
span,
530532
"try adding a return type",
531-
format!("-> {} ", self.resolve_vars_with_obligations(found)),
533+
format!("-> {} ", found),
532534
Applicability::MachineApplicable,
533535
);
534536
true
535537
}
536538
(&hir::FnRetTy::DefaultReturn(span), false, true, true) => {
537-
err.span_label(span, "possibly return type missing here?");
539+
// FIXME: if `found` could be `impl Iterator` or `impl Fn*`, we should suggest
540+
// that.
541+
err.span_suggestion(
542+
span,
543+
"a return type might be missing here",
544+
"-> _ ".to_string(),
545+
Applicability::HasPlaceholders,
546+
);
538547
true
539548
}
540549
(&hir::FnRetTy::DefaultReturn(span), _, false, true) => {

‎src/test/ui/async-await/issue-61076.rs

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ async fn baz() -> Result<(), ()> {
8787

8888
async fn match_() {
8989
match tuple() { //~ HELP consider `await`ing on the `Future`
90+
//~^ NOTE this expression has type `impl Future<Output = Tuple>`
9091
Tuple(_) => {} //~ ERROR mismatched types
9192
//~^ NOTE expected opaque type, found struct `Tuple`
9293
//~| NOTE expected opaque type `impl Future<Output = Tuple>`

‎src/test/ui/async-await/issue-61076.stderr

+4-1
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ LL | struct_().await.method();
5656
| ++++++
5757

5858
error[E0308]: mismatched types
59-
--> $DIR/issue-61076.rs:90:9
59+
--> $DIR/issue-61076.rs:91:9
6060
|
61+
LL | match tuple() {
62+
| ------- this expression has type `impl Future<Output = Tuple>`
63+
LL |
6164
LL | Tuple(_) => {}
6265
| ^^^^^^^^ expected opaque type, found struct `Tuple`
6366
|

‎src/test/ui/async-await/suggest-missing-await.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ LL ~ 1 => dummy().await,
9191
error[E0308]: mismatched types
9292
--> $DIR/suggest-missing-await.rs:53:9
9393
|
94+
LL | let _x = match dummy() {
95+
| ------- this expression has type `impl Future<Output = ()>`
9496
LL | () => {}
9597
| ^^ expected opaque type, found `()`
9698
|
@@ -109,6 +111,9 @@ LL | let _x = match dummy().await {
109111
error[E0308]: mismatched types
110112
--> $DIR/suggest-missing-await.rs:67:9
111113
|
114+
LL | match dummy_result() {
115+
| -------------- this expression has type `impl Future<Output = Result<(), ()>>`
116+
...
112117
LL | Ok(_) => {}
113118
| ^^^^^ expected opaque type, found enum `Result`
114119
|
@@ -127,6 +132,9 @@ LL | match dummy_result().await {
127132
error[E0308]: mismatched types
128133
--> $DIR/suggest-missing-await.rs:69:9
129134
|
135+
LL | match dummy_result() {
136+
| -------------- this expression has type `impl Future<Output = Result<(), ()>>`
137+
...
130138
LL | Err(_) => {}
131139
| ^^^^^^ expected opaque type, found enum `Result`
132140
|

‎src/test/ui/blind/blind-item-block-middle.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | mod foo { pub struct bar; }
55
| --------------- unit struct defined here
66
...
77
LL | let bar = 5;
8-
| ^^^
8+
| ^^^ - this expression has type `{integer}`
99
| |
1010
| expected integer, found struct `bar`
1111
| `bar` is interpreted as a unit struct, not a new binding

‎src/test/ui/block-result/issue-20862.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
22
--> $DIR/issue-20862.rs:2:5
33
|
44
LL | fn foo(x: i32) {
5-
| - possibly return type missing here?
5+
| - help: a return type might be missing here: `-> _`
66
LL | |y| x + y
77
| ^^^^^^^^^ expected `()`, found closure
88
|

‎src/test/ui/destructuring-assignment/default-match-bindings-forbidden.stderr

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
22
--> $DIR/default-match-bindings-forbidden.rs:4:5
33
|
44
LL | (x, y) = &(1, 2);
5-
| ^^^^^^ expected reference, found tuple
5+
| ^^^^^^ ------- this expression has type `&({integer}, {integer})`
6+
| |
7+
| expected reference, found tuple
68
|
79
= note: expected type `&({integer}, {integer})`
810
found tuple `(_, _)`

‎src/test/ui/destructuring-assignment/tuple_destructure_fail.stderr

+6-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ error[E0308]: mismatched types
1010
--> $DIR/tuple_destructure_fail.rs:6:5
1111
|
1212
LL | (a, a, b) = (1, 2);
13-
| ^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
13+
| ^^^^^^^^^ ------ this expression has type `({integer}, {integer})`
14+
| |
15+
| expected a tuple with 2 elements, found one with 3 elements
1416
|
1517
= note: expected type `({integer}, {integer})`
1618
found tuple `(_, _, _)`
@@ -27,7 +29,9 @@ error[E0308]: mismatched types
2729
--> $DIR/tuple_destructure_fail.rs:8:5
2830
|
2931
LL | (_,) = (1, 2);
30-
| ^^^^ expected a tuple with 2 elements, found one with 1 element
32+
| ^^^^ ------ this expression has type `({integer}, {integer})`
33+
| |
34+
| expected a tuple with 2 elements, found one with 1 element
3135
|
3236
= note: expected type `({integer}, {integer})`
3337
found tuple `(_,)`

‎src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/exclusive_range_pattern_syntax_collision.rs:6:13
33
|
4+
LL | match [5..4, 99..105, 43..44] {
5+
| ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
46
LL | [_, 99.., _] => {},
57
| ^^ expected struct `std::ops::Range`, found integer
68
|

‎src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision2.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ LL | [_, 99..] => {},
77
error[E0308]: mismatched types
88
--> $DIR/exclusive_range_pattern_syntax_collision2.rs:6:13
99
|
10+
LL | match [5..4, 99..105, 43..44] {
11+
| ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
1012
LL | [_, 99..] => {},
1113
| ^^ expected struct `std::ops::Range`, found integer
1214
|

‎src/test/ui/half-open-range-patterns/exclusive_range_pattern_syntax_collision3.stderr

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/exclusive_range_pattern_syntax_collision3.rs:6:12
33
|
4+
LL | match [5..4, 99..105, 43..44] {
5+
| ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
46
LL | [..9, 99..100, _] => {},
57
| ^ expected struct `std::ops::Range`, found integer
68
|
@@ -10,6 +12,8 @@ LL | [..9, 99..100, _] => {},
1012
error[E0308]: mismatched types
1113
--> $DIR/exclusive_range_pattern_syntax_collision3.rs:6:15
1214
|
15+
LL | match [5..4, 99..105, 43..44] {
16+
| ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
1317
LL | [..9, 99..100, _] => {},
1418
| ^^ --- this is of type `{integer}`
1519
| |
@@ -21,6 +25,8 @@ LL | [..9, 99..100, _] => {},
2125
error[E0308]: mismatched types
2226
--> $DIR/exclusive_range_pattern_syntax_collision3.rs:6:19
2327
|
28+
LL | match [5..4, 99..105, 43..44] {
29+
| ----------------------- this expression has type `[std::ops::Range<{integer}>; 3]`
2430
LL | [..9, 99..100, _] => {},
2531
| -- ^^^ expected struct `std::ops::Range`, found integer
2632
| |

‎src/test/ui/half-open-range-patterns/pat-tuple-5.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/pat-tuple-5.rs:8:10
33
|
4+
LL | match (0, 1) {
5+
| ------ this expression has type `({integer}, {integer})`
46
LL | (PAT ..) => {}
57
| ^^^ expected tuple, found `u8`
68
|

‎src/test/ui/issues/issue-11844.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/issue-11844.rs:6:9
33
|
4+
LL | match a {
5+
| - this expression has type `Option<Box<{integer}>>`
46
LL | Ok(a) =>
57
| ^^^^^ expected enum `Option`, found enum `Result`
68
|

‎src/test/ui/issues/issue-12552.stderr

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/issue-12552.rs:6:5
33
|
4+
LL | match t {
5+
| - this expression has type `Result<_, {integer}>`
46
LL | Some(k) => match k {
57
| ^^^^^^^ expected enum `Result`, found enum `Option`
68
|
@@ -10,6 +12,9 @@ LL | Some(k) => match k {
1012
error[E0308]: mismatched types
1113
--> $DIR/issue-12552.rs:9:5
1214
|
15+
LL | match t {
16+
| - this expression has type `Result<_, {integer}>`
17+
...
1318
LL | None => ()
1419
| ^^^^ expected enum `Result`, found enum `Option`
1520
|

‎src/test/ui/issues/issue-13466.stderr

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/issue-13466.rs:8:9
33
|
4+
LL | let _x: usize = match Some(1) {
5+
| ------- this expression has type `Option<{integer}>`
46
LL | Ok(u) => u,
57
| ^^^^^ expected enum `Option`, found enum `Result`
68
|
@@ -10,6 +12,9 @@ LL | Ok(u) => u,
1012
error[E0308]: mismatched types
1113
--> $DIR/issue-13466.rs:14:9
1214
|
15+
LL | let _x: usize = match Some(1) {
16+
| ------- this expression has type `Option<{integer}>`
17+
...
1318
LL | Err(e) => panic!(e)
1419
| ^^^^^^ expected enum `Option`, found enum `Result`
1520
|

‎src/test/ui/issues/issue-33504.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | struct Test;
55
| ------------ unit struct defined here
66
...
77
LL | let Test = 1;
8-
| ^^^^
8+
| ^^^^ - this expression has type `{integer}`
99
| |
1010
| expected integer, found struct `Test`
1111
| `Test` is interpreted as a unit struct, not a new binding

‎src/test/ui/issues/issue-3680.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
error[E0308]: mismatched types
22
--> $DIR/issue-3680.rs:3:9
33
|
4+
LL | match None {
5+
| ---- this expression has type `Option<_>`
46
LL | Err(_) => ()
57
| ^^^^^^ expected enum `Option`, found enum `Result`
68
|

‎src/test/ui/issues/issue-4968.stderr

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ LL | const A: (isize,isize) = (4,2);
55
| ------------------------------- constant defined here
66
LL | fn main() {
77
LL | match 42 { A => () }
8-
| ^
9-
| |
10-
| expected integer, found tuple
11-
| `A` is interpreted as a constant, not a new binding
12-
| help: introduce a new binding instead: `other_a`
8+
| -- ^
9+
| | |
10+
| | expected integer, found tuple
11+
| | `A` is interpreted as a constant, not a new binding
12+
| | help: introduce a new binding instead: `other_a`
13+
| this expression has type `{integer}`
1314
|
1415
= note: expected type `{integer}`
1516
found tuple `(isize, isize)`

‎src/test/ui/issues/issue-66706.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,23 @@ error[E0308]: mismatched types
3636
--> $DIR/issue-66706.rs:2:5
3737
|
3838
LL | fn a() {
39-
| - possibly return type missing here?
39+
| - help: try adding a return type: `-> [i32; _]`
4040
LL | [0; [|_: _ &_| ()].len()]
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found array `[{integer}; _]`
4242

4343
error[E0308]: mismatched types
4444
--> $DIR/issue-66706.rs:14:5
4545
|
4646
LL | fn c() {
47-
| - possibly return type missing here?
47+
| - help: try adding a return type: `-> [i32; _]`
4848
LL | [0; [|&_: _ &_| {}; 0 ].len()]
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found array `[{integer}; _]`
5050

5151
error[E0308]: mismatched types
5252
--> $DIR/issue-66706.rs:20:5
5353
|
5454
LL | fn d() {
55-
| - possibly return type missing here?
55+
| - help: try adding a return type: `-> [i32; _]`
5656
LL | [0; match [|f @ &ref _| () ] {} ]
5757
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found array `[{integer}; _]`
5858

‎src/test/ui/issues/issue-72574-1.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ LL | (_a, _x @ ..) => {}
2121
error[E0308]: mismatched types
2222
--> $DIR/issue-72574-1.rs:4:9
2323
|
24+
LL | match x {
25+
| - this expression has type `({integer}, {integer}, {integer})`
2426
LL | (_a, _x @ ..) => {}
2527
| ^^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 2 elements
2628
|

0 commit comments

Comments
 (0)