A lil more

Author: Nadrieril

compiler/rustc_mir_build/src/build/matches/mod.rs

@@ -1071,12 +1071,8 @@ pub(crate) struct MatchAutomatonStep<'a, 'c, 'pat, 'tcx> {
     place: PlaceBuilder<'tcx>,
     /// ... depending on the result, branch to one of these candidate lists...
     target_candidates: Vec<Vec<&'a mut Candidate<'pat, 'tcx>>>,
-    /// ... if it doesn't match, continue with these...
+    /// ... if it doesn't match, continue with these.
     remaining_candidates: &'a mut [&'c mut Candidate<'pat, 'tcx>],
-    /// ... and if nothing matches, continue to this block.
-    otherwise_block: &'a mut Option<BasicBlock>,
-    /// Track places that need fake borrows.
-    fake_borrows: &'a mut Option<FxIndexSet<Place<'tcx>>>,
 }
 
 impl<'b, 'c, 'pat, 'tcx> std::fmt::Debug for MatchAutomatonStep<'b, 'c, 'pat, 'tcx> {
@@ -1414,8 +1410,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         match first_candidate.match_pairs[0].pattern.kind {
             PatKind::Or { .. } => (),
             _ => {
-                let step = self.build_test_step(candidates, otherwise_block, fake_borrows);
-                self.perform_test(span, scrutinee_span, block, step);
+                let step = self.build_test_step(candidates, fake_borrows);
+                self.perform_test(span, scrutinee_span, block, otherwise_block, fake_borrows, step);
                 return;
             }
         }
@@ -1648,8 +1644,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     fn build_test_step<'pat, 'b, 'c>(
         &mut self,
         mut candidates: &'b mut [&'c mut Candidate<'pat, 'tcx>],
-        otherwise_block: &'b mut Option<BasicBlock>,
-        fake_borrows: &'b mut Option<FxIndexSet<Place<'tcx>>>,
+        fake_borrows: &mut Option<FxIndexSet<Place<'tcx>>>,
     ) -> MatchAutomatonStep<'b, 'c, 'pat, 'tcx> {
         // extract the match-pair from the highest priority candidate
         let match_pair = &candidates.first().unwrap().match_pairs[0];
@@ -1720,8 +1715,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             place: match_place,
             remaining_candidates: candidates,
             target_candidates,
-            otherwise_block,
-            fake_borrows,
         }
     }
 

compiler/rustc_mir_build/src/build/matches/test.rs

@@ -8,7 +8,7 @@
 use crate::build::expr::as_place::PlaceBuilder;
 use crate::build::matches::{Candidate, MatchPair, Test, TestKind};
 use crate::build::Builder;
-use rustc_data_structures::fx::FxIndexMap;
+use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_hir::{LangItem, RangeEnd};
 use rustc_index::bit_set::BitSet;
 use rustc_middle::mir::*;
@@ -155,6 +155,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         match_start_span: Span,
         scrutinee_span: Span,
         block: BasicBlock,
+        otherwise_block: &mut Option<BasicBlock>,
+        fake_borrows: &mut Option<FxIndexSet<Place<'tcx>>>,
         step: MatchAutomatonStep<'_, '_, '_, 'tcx>,
     ) {
         let test = &step.test;
@@ -170,7 +172,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             // otherwise it's the `otherwise_block`.
             let remainder_start = &mut None;
             let remainder_start = if step.remaining_candidates.is_empty() {
-                &mut *step.otherwise_block
+                &mut *otherwise_block
             } else {
                 remainder_start
             };
@@ -191,7 +193,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                             candidate_start,
                             remainder_start,
                             &mut *candidates,
-                            step.fake_borrows,
+                            fake_borrows,
                         );
                         candidate_start
                     } else {
@@ -206,9 +208,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     match_start_span,
                     scrutinee_span,
                     remainder_start,
-                    step.otherwise_block,
+                    otherwise_block,
                     step.remaining_candidates,
-                    step.fake_borrows,
+                    fake_borrows,
                 );
             };