diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2024-07-17 21:41:42 +1000 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2024-07-17 21:50:12 +1000 |
| commit | 411fcb6b2df7337377626680ef5ec5d99b5eba23 (patch) | |
| tree | fc68353979a03a7358c9d1ebcebd209b289c3a0a | |
| parent | 03bfa3690ef0d0acf6ea0dd0e4ea832d6eeb5524 (diff) | |
| download | rust-411fcb6b2df7337377626680ef5ec5d99b5eba23.tar.gz rust-411fcb6b2df7337377626680ef5ec5d99b5eba23.zip | |
Rename `test` to `pick_test_for_match_pair`
| -rw-r--r-- | compiler/rustc_mir_build/src/build/matches/mod.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_mir_build/src/build/matches/test.rs | 5 |
2 files changed, 6 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 535ee8946f2..6910b32cfa7 100644 --- a/compiler/rustc_mir_build/src/build/matches/mod.rs +++ b/compiler/rustc_mir_build/src/build/matches/mod.rs @@ -1809,8 +1809,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { /// [`Range`]: TestKind::Range fn pick_test(&mut self, candidates: &[&mut Candidate<'_, 'tcx>]) -> (Place<'tcx>, Test<'tcx>) { // Extract the match-pair from the highest priority candidate - let match_pair = &candidates.first().unwrap().match_pairs[0]; - let test = self.test(match_pair); + let match_pair = &candidates[0].match_pairs[0]; + let test = self.pick_test_for_match_pair(match_pair); // Unwrap is ok after simplification. let match_place = match_pair.place.unwrap(); debug!(?test, ?match_pair); diff --git a/compiler/rustc_mir_build/src/build/matches/test.rs b/compiler/rustc_mir_build/src/build/matches/test.rs index fb59cee99c0..6f2d2022ac5 100644 --- a/compiler/rustc_mir_build/src/build/matches/test.rs +++ b/compiler/rustc_mir_build/src/build/matches/test.rs @@ -26,7 +26,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { /// Identifies what test is needed to decide if `match_pair` is applicable. /// /// It is a bug to call this with a not-fully-simplified pattern. - pub(super) fn test<'pat>(&mut self, match_pair: &MatchPairTree<'pat, 'tcx>) -> Test<'tcx> { + pub(super) fn pick_test_for_match_pair<'pat>( + &mut self, + match_pair: &MatchPairTree<'pat, 'tcx>, + ) -> Test<'tcx> { let kind = match match_pair.test_case { TestCase::Variant { adt_def, variant_index: _ } => TestKind::Switch { adt_def }, |