bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Unify Variant and Leaf into print::PatKind::StructLike

Browse source
This commit is contained in:
Zalathar 2024-08-02 20:05:44 +10:00
parent ccfd94e334
commit 74f76ae5ea
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_pattern_analysis/src/rustc.rs
View file

@ -23,6 +23,7 @@ use crate::constructor::{
};
use crate::lints::lint_nonexhaustive_missing_variants;
use crate::pat_column::PatternColumn;
use crate::rustc::print::EnumInfo;
use crate::usefulness::{compute_match_usefulness, PlaceValidity};
use crate::{errors, Captures, PatCx, PrivateUninhabitedField};
@ -832,7 +833,8 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
Bool(b) => PatKind::Constant { value: mir::Const::from_bool(cx.tcx, *b) },
IntRange(range) => return self.hoist_pat_range(range, *pat.ty()),
Struct | Variant(_) | UnionField => match pat.ty().kind() {
ty::Tuple(..) => PatKind::Leaf {
ty::Tuple(..) => PatKind::StructLike {
enum_info: EnumInfo::NotEnum,
subpatterns: subpatterns
.enumerate()
.map(|(i, pattern)| FieldPat { field: FieldIdx::new(i), pattern })
@ -844,18 +846,20 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
// the pattern is a box pattern.
PatKind::Deref { subpattern: subpatterns.next().unwrap() }
}
ty::Adt(adt_def, _args) => {
let variant_index = RustcPatCtxt::variant_index_for_adt(&pat.ctor(), *adt_def);
&ty::Adt(adt_def, _) => {
let variant_index = RustcPatCtxt::variant_index_for_adt(&pat.ctor(), adt_def);
let subpatterns = subpatterns
.enumerate()
.map(|(i, pattern)| FieldPat { field: FieldIdx::new(i), pattern })
.collect();
if adt_def.is_enum() {
PatKind::Variant { adt_def: *adt_def, variant_index, subpatterns }
let enum_info = if adt_def.is_enum() {
EnumInfo::Enum { adt_def, variant_index }
} else {
PatKind::Leaf { subpatterns }
}
EnumInfo::NotEnum
};
PatKind::StructLike { enum_info, subpatterns }
}
_ => bug!("unexpected ctor for type {:?} {:?}", pat.ctor(), *pat.ty()),
},