user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #151854 - chenyukang:yukang-fix-142602-let-else-break-diag, r=Kivooeo

Browse source 
Show break type expectation cause for let-else

Fixes rust-lang/rust#142602
This commit is contained in:
Jonathan Brouwer 2026-01-30 13:20:25 +01:00 • committed by GitHub
commit b243d015f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 52 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_hir_typeck/src/demand.rs
View file

@ -605,6 +605,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
parent_id = self.tcx.parent_hir_id(*hir_id);
parent
}
hir::Node::Stmt(hir::Stmt { hir_id, kind: hir::StmtKind::Let(_), .. }) => {
parent_id = self.tcx.parent_hir_id(*hir_id);
parent
}
hir::Node::LetStmt(hir::LetStmt { hir_id, .. }) => {
parent_id = self.tcx.parent_hir_id(*hir_id);
parent
}
hir::Node::Block(_) => {
parent_id = self.tcx.parent_hir_id(parent_id);
parent

23
tests/ui/let-else/let-else-break-help-issue-142602.rs Normal file
View file

@ -0,0 +1,23 @@
// testcase from https://github.com/rust-lang/rust/issues/142602
pub fn main() {
// Case 1: break before let-else
let _a = loop {
if true {
break;
}
let Some(_) = Some(5) else {
break 3; //~ ERROR mismatched types
};
};
// Case 2: two let-else statements
let _b = loop {
let Some(_) = Some(5) else {
break;
};
let Some(_) = Some(4) else {
break 3; //~ ERROR mismatched types
};
};
}

21
tests/ui/let-else/let-else-break-help-issue-142602.stderr Normal file
View file

@ -0,0 +1,21 @@
error[E0308]: mismatched types
--> $DIR/let-else-break-help-issue-142602.rs:10:19
|
LL | break;
| ----- expected because of this `break`
...
LL | break 3;
| ^ expected `()`, found integer
error[E0308]: mismatched types
--> $DIR/let-else-break-help-issue-142602.rs:20:19
|
LL | break;
| ----- expected because of this `break`
...
LL | break 3;
| ^ expected `()`, found integer
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0308`.