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

Update match checking.

Browse source 
fn is_useful , more skeletons

Specify a lifetime on pattern references

impl PatStack

fill impl Matrix

PatStack::pop_head_constructor

Index-based approach

struct PatCtxt

fields construction fn Fields::wildcards

split wildcard

fn Constructor::is_covered_by_any(..)

fn Matrix::specialize_constructor(..)

impl Usefulness

Initial work on witness construction

Reorganize files

Replace match checking diagnostic

Handle types of expanded patterns

unit match checking go brrr
This commit is contained in:
Dawer 2021-04-22 20:17:27 +05:00
parent 7c1d8ca635
commit c3c2893f30
6 changed files with 1471 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

70
crates/hir_ty/src/diagnostics/expr.rs
View file

@ -62,7 +62,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
match expr {
Expr::Match { expr, arms } => {
self.validate_match(id, *expr, arms, db, self.infer.clone());
self.validate_match2(id, *expr, arms, db, self.infer.clone());
}
Expr::Call { .. } | Expr::MethodCall { .. } => {
self.validate_call(db, id, expr);
@ -277,6 +277,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
}
}
#[allow(dead_code)]
fn validate_match(
&mut self,
id: ExprId,
@ -358,6 +359,73 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
}
}
fn validate_match2(
&mut self,
id: ExprId,
match_expr: ExprId,
arms: &[MatchArm],
db: &dyn HirDatabase,
infer: Arc<InferenceResult>,
) {
use crate::diagnostics::pattern::usefulness;
use hir_def::HasModule;
let (body, source_map): (Arc<Body>, Arc<BodySourceMap>) =
db.body_with_source_map(self.owner);
let match_expr_ty = if infer.type_of_expr[match_expr].is_unknown() {
return;
} else {
&infer.type_of_expr[match_expr]
};
eprintln!("ExprValidator::validate_match2({:?})", match_expr_ty.kind(&Interner));
let pattern_arena = usefulness::PatternArena::clone_from(&body.pats);
let cx = usefulness::MatchCheckCtx {
krate: self.owner.module(db.upcast()).krate(),
match_expr,
body,
infer: &infer,
db,
pattern_arena: &pattern_arena,
};
let m_arms: Vec<_> = arms
.iter()
.map(|arm| usefulness::MatchArm { pat: arm.pat, has_guard: arm.guard.is_some() })
.collect();
let report = usefulness::compute_match_usefulness(&cx, &m_arms);
// TODO Report unreacheble arms
// let mut catchall = None;
// for (arm_index, (arm, is_useful)) in report.arm_usefulness.iter().enumerate() {
// match is_useful{
// Unreachable => {
// }
// Reachable(_) => {}
// }
// }
let witnesses = report.non_exhaustiveness_witnesses;
if !witnesses.is_empty() {
if let Ok(source_ptr) = source_map.expr_syntax(id) {
let root = source_ptr.file_syntax(db.upcast());
if let ast::Expr::MatchExpr(match_expr) = &source_ptr.value.to_node(&root) {
if let (Some(match_expr), Some(arms)) =
(match_expr.expr(), match_expr.match_arm_list())
{
self.sink.push(MissingMatchArms {
file: source_ptr.file_id,
match_expr: AstPtr::new(&match_expr),
arms: AstPtr::new(&arms),
})
}
}
}
}
}
fn validate_results_in_tail_expr(&mut self, body_id: ExprId, id: ExprId, db: &dyn HirDatabase) {
// the mismatch will be on the whole block currently
let mismatch = match self.infer.type_mismatch_for_expr(body_id) {