about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZalathar <Zalathar@users.noreply.github.com>2024-04-17 19:31:30 +1000
committerZalathar <Zalathar@users.noreply.github.com>2024-04-17 19:59:39 +1000
commitd3c30519956ca989f64f53410cdb95e22913e942 (patch)
tree1df2ea592d76f4d2a3233ec41b751f05d044b676
parent6c6b3027ef62e911142cfc55589baef4e9f38ec8 (diff)
downloadrust-d3c30519956ca989f64f53410cdb95e22913e942.tar.gz
rust-d3c30519956ca989f64f53410cdb95e22913e942.zip
Move confusing comment about otherwise blocks in `lower_match_tree`
This comment was historically inside a block guarded by
`if let Some(otherwise_block) = otherwise`.

When #120978 made the otherwise block non-optional, it also flattened that
region of code. Doing so left this comment awkwardly stranded above an
unrelated line of code, without its original context.

We can restore that context by moving it above the declaration of `otherwise`.
-rw-r--r--compiler/rustc_mir_build/src/build/matches/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_mir_build/src/build/matches/mod.rs b/compiler/rustc_mir_build/src/build/matches/mod.rs
index 367c391b45a..3e1cae045e8 100644
--- a/compiler/rustc_mir_build/src/build/matches/mod.rs
+++ b/compiler/rustc_mir_build/src/build/matches/mod.rs
@@ -385,15 +385,15 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let fake_borrows = match_has_guard
             .then(|| util::FakeBorrowCollector::collect_fake_borrows(self, candidates));
 
+        // See the doc comment on `match_candidates` for why we have an
+        // otherwise block. Match checking will ensure this is actually
+        // unreachable.
         let otherwise_block = self.cfg.start_new_block();
 
         // This will generate code to test scrutinee_place and
         // branch to the appropriate arm block
         self.match_candidates(match_start_span, scrutinee_span, block, otherwise_block, candidates);
 
-        // See the doc comment on `match_candidates` for why we may have an
-        // otherwise block. Match checking will ensure this is actually
-        // unreachable.
         let source_info = self.source_info(scrutinee_span);
 
         // Matching on a `scrutinee_place` with an uninhabited type doesn't