mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tiny simplification

Browse Source
This commit is contained in:
Nadrieril 2024-02-19 02:42:14 +01:00
parent f8131a48a4
commit 5c9d580fea
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compiler/rustc_mir_build/src/build/matches/test.rs
View File

@ -29,44 +29,34 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
/// ///
/// It is a bug to call this with a not-fully-simplified pattern. /// It is a bug to call this with a not-fully-simplified pattern.
pub(super) fn test<'pat>(&mut self, match_pair: &MatchPair<'pat, 'tcx>) -> Test<'tcx> { pub(super) fn test<'pat>(&mut self, match_pair: &MatchPair<'pat, 'tcx>) -> Test<'tcx> {
match match_pair.pattern.kind { let kind = match match_pair.pattern.kind {
PatKind::Variant { adt_def, args: _, variant_index: _, subpatterns: _ } => Test { PatKind::Variant { adt_def, args: _, variant_index: _, subpatterns: _ } => {
span: match_pair.pattern.span, TestKind::Switch { adt_def, variants: BitSet::new_empty(adt_def.variants().len()) }
kind: TestKind::Switch { }
adt_def,
variants: BitSet::new_empty(adt_def.variants().len()),
},
},
PatKind::Constant { .. } if is_switch_ty(match_pair.pattern.ty) => { PatKind::Constant { .. } if is_switch_ty(match_pair.pattern.ty) => {
// For integers, we use a `SwitchInt` match, which allows // For integers, we use a `SwitchInt` match, which allows
// us to handle more cases. // us to handle more cases.
Test { TestKind::SwitchInt {
span: match_pair.pattern.span, switch_ty: match_pair.pattern.ty,
kind: TestKind::SwitchInt {
switch_ty: match_pair.pattern.ty,
// these maps are empty to start; cases are // these maps are empty to start; cases are
// added below in add_cases_to_switch // added below in add_cases_to_switch
options: Default::default(), options: Default::default(),
},
} }
} }
PatKind::Constant { value } => Test { PatKind::Constant { value } => TestKind::Eq { value, ty: match_pair.pattern.ty },
span: match_pair.pattern.span,
kind: TestKind::Eq { value, ty: match_pair.pattern.ty },
},
PatKind::Range(ref range) => { PatKind::Range(ref range) => {
assert_eq!(range.ty, match_pair.pattern.ty); assert_eq!(range.ty, match_pair.pattern.ty);
Test { span: match_pair.pattern.span, kind: TestKind::Range(range.clone()) } TestKind::Range(range.clone())
} }
PatKind::Slice { ref prefix, ref slice, ref suffix } => { PatKind::Slice { ref prefix, ref slice, ref suffix } => {
let len = prefix.len() + suffix.len(); let len = prefix.len() + suffix.len();
let op = if slice.is_some() { BinOp::Ge } else { BinOp::Eq }; let op = if slice.is_some() { BinOp::Ge } else { BinOp::Eq };
Test { span: match_pair.pattern.span, kind: TestKind::Len { len: len as u64, op } } TestKind::Len { len: len as u64, op }
} }
PatKind::Or { .. } => bug!("or-patterns should have already been handled"), PatKind::Or { .. } => bug!("or-patterns should have already been handled"),
@ -80,7 +70,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
| PatKind::Leaf { .. } | PatKind::Leaf { .. }
| PatKind::Deref { .. } | PatKind::Deref { .. }
| PatKind::Error(_) => self.error_simplifiable(match_pair), | PatKind::Error(_) => self.error_simplifiable(match_pair),
} };
Test { span: match_pair.pattern.span, kind }
} }
pub(super) fn add_cases_to_switch<'pat>( pub(super) fn add_cases_to_switch<'pat>(