language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: Skip match check on a pattern of unexpected TyKind::FnDef

Browse source
This commit is contained in:
iDawer 2022-04-05 00:05:20 +05:00
parent bf6303df37
commit 86665e50c2
2 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/hir_ty/src/diagnostics/match_check.rs
View file

@ -11,7 +11,7 @@ pub(crate) mod deconstruct_pat;
pub(crate) mod usefulness; pub(crate) mod usefulness;
use hir_def::{body::Body, expr::PatId, EnumVariantId, LocalFieldId, VariantId}; use hir_def::{body::Body, expr::PatId, EnumVariantId, LocalFieldId, VariantId};
use stdx::never; use stdx::{always, never};
use crate::{ use crate::{
db::HirDatabase, infer::BindingMode, InferenceResult, Interner, Substitution, Ty, TyKind, db::HirDatabase, infer::BindingMode, InferenceResult, Interner, Substitution, Ty, TyKind,
@ -127,7 +127,11 @@ impl<'a> PatCtxt<'a> {
hir_def::expr::Pat::Tuple { ref args, ellipsis } => { hir_def::expr::Pat::Tuple { ref args, ellipsis } => {
let arity = match *ty.kind(Interner) { let arity = match *ty.kind(Interner) {
TyKind::Tuple(arity, _) => arity, TyKind::Tuple(arity, _) => arity,
_ => panic!("unexpected type for tuple pattern: {:?}", ty), _ => {
never!("unexpected type for tuple pattern: {:?}", ty);
self.errors.push(PatternError::UnexpectedType);
return Pat { ty: ty.clone(), kind: PatKind::Wild.into() };
}
}; };
let subpatterns = self.lower_tuple_subpats(args, arity, ellipsis); let subpatterns = self.lower_tuple_subpats(args, arity, ellipsis);
PatKind::Leaf { subpatterns } PatKind::Leaf { subpatterns }
@ -227,11 +231,16 @@ impl<'a> PatCtxt<'a> {
Some(variant_id) => { Some(variant_id) => {
if let VariantId::EnumVariantId(enum_variant) = variant_id { if let VariantId::EnumVariantId(enum_variant) = variant_id {
let substs = match ty.kind(Interner) { let substs = match ty.kind(Interner) {
TyKind::Adt(_, substs) | TyKind::FnDef(_, substs) => substs.clone(), TyKind::Adt(_, substs) => substs.clone(),
TyKind::Error => { kind => {
always!(
matches!(kind, TyKind::FnDef(..) | TyKind::Error),
"inappropriate type for def: {:?}",
ty
);
self.errors.push(PatternError::UnexpectedType);
return PatKind::Wild; return PatKind::Wild;
} }
_ => panic!("inappropriate type for def: {:?}", ty),
}; };
PatKind::Variant { substs, enum_variant, subpatterns } PatKind::Variant { substs, enum_variant, subpatterns }
} else { } else {

16
crates/ide_diagnostics/src/handlers/missing_match_arms.rs
View file

@ -931,6 +931,22 @@ fn f(ty: Enum) {
); );
} }
#[test]
fn unexpected_ty_fndef() {
cov_mark::check!(validate_match_bailed_out);
check_diagnostics(
r"
enum Exp {
Tuple(()),
}
fn f() {
match __unknown {
Exp::Tuple => {}
}
}",
);
}
mod false_negatives { mod false_negatives {
//! The implementation of match checking here is a work in progress. As we roll this out, we //! The implementation of match checking here is a work in progress. As we roll this out, we
//! prefer false negatives to false positives (ideally there would be no false positives). This //! prefer false negatives to false positives (ideally there would be no false positives). This