squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Treat ctor of unhandled type as non-exhaustive.

Browse source
This commit is contained in:
Dawer 2021-05-06 17:26:05 +05:00
parent e711abc290
commit d6d77e8a35
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/hir_ty/src/diagnostics/pattern.rs
View file

@ -353,6 +353,24 @@ fn main() {
//^^^^ Missing match arm
}
"#,
);
}
#[test]
fn no_panic_at_unimplemented_subpattern_type() {
check_diagnostics(
r#"
struct S { a: char}
fn main(v: S) {
match v { S{ a } => {} }
match v { S{ a: x } => {} }
match v { S{ a: 'a' } => {} }
match v { S{..} => {} }
match v { _ => {} }
match v { }
//^ Missing match arm
}
"#,
);
}

10
crates/hir_ty/src/diagnostics/pattern/deconstruct_pat.rs
View file

@ -419,6 +419,8 @@ impl SplitWildcard {
let cx = pcx.cx;
let make_range =
|start, end, scalar| IntRange(IntRange::from_range(cx, start, end, scalar));
// FIXME(iDawer) using NonExhaustive ctor for unhandled types
let unhandled = || smallvec![NonExhaustive];
// This determines the set of all possible constructors for the type `pcx.ty`. For numbers,
// arrays and slices we use ranges and variable-length slices when appropriate.
@ -431,7 +433,7 @@ impl SplitWildcard {
let all_ctors = match pcx.ty.kind(&Interner) {
TyKind::Scalar(Scalar::Bool) => smallvec![make_range(0, 1, Scalar::Bool)],
// TyKind::Array(..) if ... => todo!(),
TyKind::Array(..) | TyKind::Slice(..) => todo!(),
TyKind::Array(..) | TyKind::Slice(..) => unhandled(),
&TyKind::Adt(AdtId(hir_def::AdtId::EnumId(enum_id)), ref _substs) => {
let enum_data = cx.db.enum_data(enum_id);
@ -466,7 +468,7 @@ impl SplitWildcard {
} else if cx.feature_exhaustive_patterns() {
// If `exhaustive_patterns` is enabled, we exclude variants known to be
// uninhabited.
todo!()
unhandled()
} else {
enum_data
.variants
@ -475,8 +477,8 @@ impl SplitWildcard {
.collect()
}
}
TyKind::Scalar(Scalar::Char) => todo!(),
TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => todo!(),
TyKind::Scalar(Scalar::Char) => unhandled(),
TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => unhandled(),
TyKind::Never if !cx.feature_exhaustive_patterns() && !pcx.is_top_level => {
smallvec![NonExhaustive]
}