bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

review

Browse source
This commit is contained in:
Nadrieril 2024-03-09 15:28:26 +01:00
parent 7843e46f17
commit 594cf1de61
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_mir_build/src/build/matches/mod.rs
View file

@ -938,6 +938,12 @@ struct PatternExtraData<'tcx> {
ascriptions: Vec<Ascription<'tcx>>, ascriptions: Vec<Ascription<'tcx>>,
} }
impl<'tcx> PatternExtraData<'tcx> {
fn is_empty(&self) -> bool {
self.bindings.is_empty() && self.ascriptions.is_empty()
}
}
/// A pattern in a form suitable for generating code. /// A pattern in a form suitable for generating code.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct FlatPat<'pat, 'tcx> { struct FlatPat<'pat, 'tcx> {
@ -970,7 +976,7 @@ impl<'tcx, 'pat> FlatPat<'pat, 'tcx> {
#[derive(Debug)] #[derive(Debug)]
struct Candidate<'pat, 'tcx> { struct Candidate<'pat, 'tcx> {
/// For the candidate to match, &ll of these must be satisfied... /// For the candidate to match, all of these must be satisfied...
// Invariant: all the `MatchPair`s are recursively simplified. // Invariant: all the `MatchPair`s are recursively simplified.
// Invariant: or-patterns must be sorted at the end. // Invariant: or-patterns must be sorted at the end.
match_pairs: Vec<MatchPair<'pat, 'tcx>>, match_pairs: Vec<MatchPair<'pat, 'tcx>>,
@ -1518,9 +1524,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
self.merge_trivial_subcandidates(subcandidate, source_info); self.merge_trivial_subcandidates(subcandidate, source_info);
// FIXME(or_patterns; matthewjasper) Try to be more aggressive here. // FIXME(or_patterns; matthewjasper) Try to be more aggressive here.
can_merge &= subcandidate.subcandidates.is_empty() can_merge &=
&& subcandidate.extra_data.bindings.is_empty() subcandidate.subcandidates.is_empty() && subcandidate.extra_data.is_empty();
&& subcandidate.extra_data.ascriptions.is_empty();
} }
if can_merge { if can_merge {