bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename Skip to PrivateUninhabited

Browse source
This commit is contained in:
Nadrieril 2024-02-28 17:56:01 +01:00
parent 39441e4cdd
commit c918893b63
5 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_pattern_analysis/src/pat.rs
View file

@ -5,7 +5,7 @@ use std::fmt;
use smallvec::{smallvec, SmallVec};
use crate::constructor::{Constructor, Slice, SliceKind};
use crate::{SkipField, TypeCx};
use crate::{PrivateUninhabitedField, TypeCx};
use self::Constructor::*;
@ -80,7 +80,7 @@ impl<Cx: TypeCx> DeconstructedPat<Cx> {
// Return a wildcard for each field of `other_ctor`.
(Wildcard, _) => wildcard_sub_tys(),
// Skip this column.
(_, Skip) => smallvec![],
(_, PrivateUninhabited) => smallvec![],
// The only non-trivial case: two slices of different arity. `other_slice` is
// guaranteed to have a larger arity, so we fill the middle part with enough
// wildcards to reach the length of the new, larger slice.
@ -189,7 +189,9 @@ impl<Cx: TypeCx> fmt::Debug for DeconstructedPat<Cx> {
}
Ok(())
}
Wildcard | Missing | NonExhaustive | Hidden | Skip => write!(f, "_ : {:?}", pat.ty()),
Wildcard | Missing | NonExhaustive | Hidden | PrivateUninhabited => {
write!(f, "_ : {:?}", pat.ty())
}
}
}
}
@ -299,7 +301,7 @@ impl<Cx: TypeCx> WitnessPat<Cx> {
pub(crate) fn wild_from_ctor(cx: &Cx, ctor: Constructor<Cx>, ty: Cx::Ty) -> Self {
let fields = cx
.ctor_sub_tys(&ctor, &ty)
.filter(|(_, SkipField(skip))| !skip)
.filter(|(_, PrivateUninhabitedField(skip))| !skip)
.map(|(ty, _)| Self::wildcard(ty))
.collect();
Self::new(ctor, fields, ty)