diff options
| author | bors <bors@rust-lang.org> | 2025-07-07 20:30:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-07 20:30:53 +0000 |
| commit | a2d45f73c70d9dec57140c9412f83586eda895f8 (patch) | |
| tree | 5fa8990e46cc6d46103cb21ad505a7116c229207 /compiler/rustc_mir_build | |
| parent | 2f8eeb2bba86b8f457ec602c578473c711f85628 (diff) | |
| parent | ff6b881c8d1b555ad07bf10e1c0b11809d68536e (diff) | |
| download | rust-a2d45f73c70d9dec57140c9412f83586eda895f8.tar.gz rust-a2d45f73c70d9dec57140c9412f83586eda895f8.zip | |
Auto merge of #143601 - matthiaskrgr:rollup-9iw2sqk, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#132469 (Do not suggest borrow that is already there in fully-qualified call) - rust-lang/rust#143340 (awhile -> a while where appropriate) - rust-lang/rust#143438 (Fix the link in `rustdoc.md`) - rust-lang/rust#143539 (Regression tests for repr ICEs) - rust-lang/rust#143566 (Fix `x86_64-unknown-netbsd` platform support page) - rust-lang/rust#143572 (Remove unused allow attrs) - rust-lang/rust#143583 (`loop_match`: fix 'no terminator on block') - rust-lang/rust#143584 (make `Machine::load_mir` infallible) - rust-lang/rust#143591 (Fix missing words in future tracking issue) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_build')
| -rw-r--r-- | compiler/rustc_mir_build/src/builder/scope.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_mir_build/src/builder/scope.rs b/compiler/rustc_mir_build/src/builder/scope.rs index 405d47c7c79..5a5456aedc2 100644 --- a/compiler/rustc_mir_build/src/builder/scope.rs +++ b/compiler/rustc_mir_build/src/builder/scope.rs @@ -936,7 +936,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { valtree } - Err(ErrorHandled::Reported(..)) => return self.cfg.start_new_block().unit(), + Err(ErrorHandled::Reported(..)) => { + return block.unit(); + } Err(ErrorHandled::TooGeneric(_)) => { self.tcx.dcx().emit_fatal(ConstContinueBadConst { span: constant.span }); } |