Skip to content

Commit 4ad3cf2

Browse files
CentrilCentril
authored
Rollup merge of rust-lang#58267 - estebank:match-arms, r=matthewjasper
Tweak "incompatible match arms" error - Point at the body expression of the match arm with the type error. - Point at the prior match arms explicitly stating the evaluated type. - Point at the entire match expr in a secondary span, instead of primary. - For type errors in the first match arm, the cause is outside of the match, treat as implicit block error to give a more appropriate error. Fix rust-lang#46776, fix rust-lang#57206. CC rust-lang#24157, rust-lang#38234.
2 parents b6ed206 + 802c897 commit 4ad3cf2

14 files changed

+206
-62
lines changed

‎src/librustc/infer/error_reporting/mod.rs

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -508,22 +508,31 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
508508
}
509509
}
510510
}
511-
ObligationCauseCode::MatchExpressionArm { arm_span, source } => match source {
511+
ObligationCauseCode::MatchExpressionArm {
512+
source,
513+
ref prior_arms,
514+
last_ty,
515+
..
516+
} => match source {
512517
hir::MatchSource::IfLetDesugar { .. } => {
513-
let msg = "`if let` arm with an incompatible type";
514-
if self.tcx.sess.source_map().is_multiline(arm_span) {
515-
err.span_note(arm_span, msg);
516-
} else {
517-
err.span_label(arm_span, msg);
518-
}
518+
let msg = "`if let` arms have incompatible types";
519+
err.span_label(cause.span, msg);
519520
}
520521
hir::MatchSource::TryDesugar => {}
521522
_ => {
522-
let msg = "match arm with an incompatible type";
523-
if self.tcx.sess.source_map().is_multiline(arm_span) {
524-
err.span_note(arm_span, msg);
525-
} else {
526-
err.span_label(arm_span, msg);
523+
let msg = "`match` arms have incompatible types";
524+
err.span_label(cause.span, msg);
525+
if prior_arms.len() <= 4 {
526+
for sp in prior_arms {
527+
err.span_label(*sp, format!(
528+
"this is found to be of type `{}`",
529+
last_ty,
530+
));
531+
}
532+
} else if let Some(sp) = prior_arms.last() {
533+
err.span_label(*sp, format!(
534+
"this and all prior arms are found to be of type `{}`", last_ty,
535+
));
527536
}
528537
}
529538
},

‎src/librustc/traits/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ impl<'tcx> ObligationCause<'tcx> {
145145
ObligationCauseCode::StartFunctionType => {
146146
tcx.sess.source_map().def_span(self.span)
147147
}
148+
ObligationCauseCode::MatchExpressionArm { arm_span, .. } => arm_span,
148149
_ => self.span,
149150
}
150151
}
@@ -223,6 +224,8 @@ pub enum ObligationCauseCode<'tcx> {
223224
MatchExpressionArm {
224225
arm_span: Span,
225226
source: hir::MatchSource,
227+
prior_arms: Vec<Span>,
228+
last_ty: Ty<'tcx>,
226229
},
227230

228231
/// Computing common supertype in the pattern guard for the arms of a match expression

‎src/librustc/traits/structural_impls.rs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,21 @@ impl<'a, 'tcx> Lift<'tcx> for traits::ObligationCauseCode<'a> {
513513
trait_item_def_id,
514514
}),
515515
super::ExprAssignable => Some(super::ExprAssignable),
516-
super::MatchExpressionArm { arm_span, source } => Some(super::MatchExpressionArm {
516+
super::MatchExpressionArm {
517517
arm_span,
518-
source: source,
519-
}),
518+
source,
519+
ref prior_arms,
520+
last_ty,
521+
} => {
522+
tcx.lift(&last_ty).map(|last_ty| {
523+
super::MatchExpressionArm {
524+
arm_span,
525+
source,
526+
prior_arms: prior_arms.clone(),
527+
last_ty,
528+
}
529+
})
530+
}
520531
super::MatchExpressionArmPattern { span, ty } => {
521532
tcx.lift(&ty).map(|ty| super::MatchExpressionArmPattern { span, ty })
522533
}

‎src/librustc_typeck/check/_match.rs

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,8 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
689689
CoerceMany::with_coercion_sites(coerce_first, arms)
690690
};
691691

692+
let mut other_arms = vec![]; // used only for diagnostics
693+
let mut prior_arm_ty = None;
692694
for (i, (arm, pats_diverge)) in arms.iter().zip(all_arm_pats_diverge).enumerate() {
693695
if let Some(ref g) = arm.guard {
694696
self.diverges.set(pats_diverge);
@@ -709,17 +711,36 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
709711
_ => false
710712
};
711713

714+
let arm_span = if let hir::ExprKind::Block(ref blk, _) = arm.body.node {
715+
// Point at the block expr instead of the entire block
716+
blk.expr.as_ref().map(|e| e.span).unwrap_or(arm.body.span)
717+
} else {
718+
arm.body.span
719+
};
712720
if is_if_let_fallback {
713721
let cause = self.cause(expr.span, ObligationCauseCode::IfExpressionWithNoElse);
714722
assert!(arm_ty.is_unit());
715723
coercion.coerce_forced_unit(self, &cause, &mut |_| (), true);
716724
} else {
717-
let cause = self.cause(expr.span, ObligationCauseCode::MatchExpressionArm {
718-
arm_span: arm.body.span,
719-
source: match_src
720-
});
725+
let cause = if i == 0 {
726+
// The reason for the first arm to fail is not that the match arms diverge,
727+
// but rather that there's a prior obligation that doesn't hold.
728+
self.cause(arm_span, ObligationCauseCode::BlockTailExpression(arm.body.id))
729+
} else {
730+
self.cause(expr.span, ObligationCauseCode::MatchExpressionArm {
731+
arm_span,
732+
source: match_src,
733+
prior_arms: other_arms.clone(),
734+
last_ty: prior_arm_ty.unwrap(),
735+
})
736+
};
721737
coercion.coerce(self, &cause, &arm.body, arm_ty);
722738
}
739+
other_arms.push(arm_span);
740+
if other_arms.len() > 5 {
741+
other_arms.remove(0);
742+
}
743+
prior_arm_ty = Some(arm_ty);
723744
}
724745

725746
// We won't diverge unless the discriminant or all arms diverge.

‎src/test/ui/if/if-let-arm-types.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
fn main() {
2-
if let Some(b) = None { //~ ERROR: `if let` arms have incompatible types
3-
//~^ expected (), found integer
4-
//~| expected type `()`
5-
//~| found type `{integer}`
2+
if let Some(b) = None {
3+
//~^ NOTE if let` arms have incompatible types
64
()
75
} else {
86
1
97
};
8+
//~^^ ERROR: `if let` arms have incompatible types
9+
//~| NOTE expected (), found integer
10+
//~| NOTE expected type `()`
1011
}

‎src/test/ui/if/if-let-arm-types.stderr

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
error[E0308]: `if let` arms have incompatible types
2-
--> $DIR/if-let-arm-types.rs:2:5
2+
--> $DIR/if-let-arm-types.rs:6:9
33
|
4-
LL | / if let Some(b) = None { //~ ERROR: `if let` arms have incompatible types
5-
LL | | //~^ expected (), found integer
6-
LL | | //~| expected type `()`
7-
LL | | //~| found type `{integer}`
8-
... |
4+
LL | / if let Some(b) = None {
5+
LL | | //~^ NOTE if let` arms have incompatible types
6+
LL | | ()
7+
LL | | } else {
98
LL | | 1
9+
| | ^ expected (), found integer
1010
LL | | };
11-
| |_____^ expected (), found integer
11+
| |_____- `if let` arms have incompatible types
1212
|
1313
= note: expected type `()`
1414
found type `{integer}`
15-
note: `if let` arm with an incompatible type
16-
--> $DIR/if-let-arm-types.rs:7:12
17-
|
18-
LL | } else {
19-
| ____________^
20-
LL | | 1
21-
LL | | };
22-
| |_____^
2315

2416
error: aborting due to previous error
2517

‎src/test/ui/issues/issue-11319.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
fn main() {
22
match Some(10) {
3-
//~^ ERROR match arms have incompatible types
4-
//~| expected type `bool`
5-
//~| found type `()`
6-
//~| expected bool, found ()
3+
//~^ NOTE `match` arms have incompatible types
74
Some(5) => false,
5+
//~^ NOTE this is found to be of type `bool`
86
Some(2) => true,
7+
//~^ NOTE this is found to be of type `bool`
98
None => (),
9+
//~^ ERROR match arms have incompatible types
10+
//~| NOTE expected bool, found ()
11+
//~| NOTE expected type `bool`
1012
_ => true
1113
}
1214
}

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
error[E0308]: match arms have incompatible types
2-
--> $DIR/issue-11319.rs:2:5
2+
--> $DIR/issue-11319.rs:8:20
33
|
44
LL | / match Some(10) {
5-
LL | | //~^ ERROR match arms have incompatible types
6-
LL | | //~| expected type `bool`
7-
LL | | //~| found type `()`
8-
... |
5+
LL | | //~^ NOTE `match` arms have incompatible types
6+
LL | | Some(5) => false,
7+
| | ----- this is found to be of type `bool`
8+
LL | | //~^ NOTE this is found to be of type `bool`
9+
LL | | Some(2) => true,
10+
| | ---- this is found to be of type `bool`
11+
LL | | //~^ NOTE this is found to be of type `bool`
912
LL | | None => (),
10-
| | -- match arm with an incompatible type
13+
| | ^^ expected bool, found ()
14+
... |
1115
LL | | _ => true
1216
LL | | }
13-
| |_____^ expected bool, found ()
17+
| |_____- `match` arms have incompatible types
1418
|
1519
= note: expected type `bool`
1620
found type `()`

‎src/test/ui/issues/issue-17728.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl Debug for Player {
9797
}
9898

9999
fn str_to_direction(to_parse: &str) -> RoomDirection {
100-
match to_parse { //~ ERROR match arms have incompatible types
100+
match to_parse {
101101
"w" | "west" => RoomDirection::West,
102102
"e" | "east" => RoomDirection::East,
103103
"n" | "north" => RoomDirection::North,
@@ -108,6 +108,7 @@ fn str_to_direction(to_parse: &str) -> RoomDirection {
108108
"down" => RoomDirection::Down,
109109
_ => None
110110
}
111+
//~^^ ERROR match arms have incompatible types
111112
}
112113

113114
fn main() {

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ LL | Some(entry) => Ok(entry),
1010
| ^^^^^^^^^ ...but data from `room` is returned here
1111

1212
error[E0308]: match arms have incompatible types
13-
--> $DIR/issue-17728.rs:100:5
13+
--> $DIR/issue-17728.rs:109:14
1414
|
15-
LL | / match to_parse { //~ ERROR match arms have incompatible types
15+
LL | / match to_parse {
1616
LL | | "w" | "west" => RoomDirection::West,
1717
LL | | "e" | "east" => RoomDirection::East,
1818
LL | | "n" | "north" => RoomDirection::North,
1919
... |
20+
LL | | "down" => RoomDirection::Down,
21+
| | ------------------- this and all prior arms are found to be of type `RoomDirection`
2022
LL | | _ => None
21-
| | ---- match arm with an incompatible type
23+
| | ^^^^ expected enum `RoomDirection`, found enum `std::option::Option`
2224
LL | | }
23-
| |_____^ expected enum `RoomDirection`, found enum `std::option::Option`
25+
| |_____- `match` arms have incompatible types
2426
|
2527
= note: expected type `RoomDirection`
2628
found type `std::option::Option<_>`

‎src/test/ui/issues/issue-24036.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ fn closure_to_loc() {
66

77
fn closure_from_match() {
88
let x = match 1usize {
9-
//~^ ERROR match arms have incompatible types
109
1 => |c| c + 1,
1110
2 => |c| c - 1,
1211
_ => |c| c - 1
1312
};
13+
//~^^^ ERROR match arms have incompatible types
1414
}
1515

1616
fn main() { }

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ LL | x = |c| c + 1;
1010
= help: consider boxing your closure and/or using it as a trait object
1111

1212
error[E0308]: match arms have incompatible types
13-
--> $DIR/issue-24036.rs:8:13
13+
--> $DIR/issue-24036.rs:10:14
1414
|
1515
LL | let x = match 1usize {
16-
| _____________^
17-
LL | | //~^ ERROR match arms have incompatible types
16+
| _____________-
1817
LL | | 1 => |c| c + 1,
18+
| | --------- this is found to be of type `[closure@$DIR/issue-24036.rs:9:14: 9:23]`
1919
LL | | 2 => |c| c - 1,
20-
| | --------- match arm with an incompatible type
20+
| | ^^^^^^^^^ expected closure, found a different closure
2121
LL | | _ => |c| c - 1
2222
LL | | };
23-
| |_____^ expected closure, found a different closure
23+
| |_____- `match` arms have incompatible types
2424
|
25-
= note: expected type `[closure@$DIR/issue-24036.rs:10:14: 10:23]`
26-
found type `[closure@$DIR/issue-24036.rs:11:14: 11:23]`
25+
= note: expected type `[closure@$DIR/issue-24036.rs:9:14: 9:23]`
26+
found type `[closure@$DIR/issue-24036.rs:10:14: 10:23]`
2727
= note: no two closures, even if identical, have the same type
2828
= help: consider boxing your closure and/or using it as a trait object
2929

‎src/test/ui/match/match-type-err-first-arm.rs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
fn main() {
2+
let _ = test_func1(1);
3+
let _ = test_func2(1);
4+
}
5+
6+
fn test_func1(n: i32) -> i32 {
7+
//~^ NOTE expected `i32` because of return type
8+
match n {
9+
12 => 'b',
10+
//~^ ERROR mismatched types
11+
//~| NOTE expected i32, found char
12+
_ => 42,
13+
}
14+
}
15+
16+
fn test_func2(n: i32) -> i32 {
17+
let x = match n {
18+
//~^ NOTE `match` arms have incompatible types
19+
12 => 'b',
20+
//~^ NOTE this is found to be of type `char`
21+
_ => 42,
22+
//~^ ERROR match arms have incompatible types
23+
//~| NOTE expected char, found integer
24+
//~| NOTE expected type `char`
25+
};
26+
x
27+
}
28+
29+
fn test_func3(n: i32) -> i32 {
30+
let x = match n {
31+
//~^ NOTE `match` arms have incompatible types
32+
1 => 'b',
33+
2 => 'b',
34+
3 => 'b',
35+
4 => 'b',
36+
5 => 'b',
37+
6 => 'b',
38+
//~^ NOTE this and all prior arms are found to be of type `char`
39+
_ => 42,
40+
//~^ ERROR match arms have incompatible types
41+
//~| NOTE expected char, found integer
42+
//~| NOTE expected type `char`
43+
};
44+
x
45+
}

0 commit comments

Comments
 (0)