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

Infer type of match guard

Browse source
This commit is contained in:
Marcus Klaas de Vries 2019-01-28 23:06:11 +01:00
parent 3f4f50baaa
commit 3daca3eb4d
10 changed files with 152 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_hir/src/expr.rs
View file

@ -215,7 +215,7 @@ pub use ra_syntax::ast::BinOp as BinaryOp;
#[derive(Debug, Clone, Eq, PartialEq)]
pub struct MatchArm {
pub pats: Vec<PatId>,
// guard: Option<ExprId>, // TODO
pub guard: Option<ExprId>,
pub expr: ExprId,
}
@ -511,10 +511,12 @@ impl ExprCollector {
MatchArm {
pats: vec![pat],
expr: then_branch,
guard: None,
},
MatchArm {
pats: vec![placeholder_pat],
expr: else_branch,
guard: None,
},
];
self.alloc_expr(
@ -613,6 +615,10 @@ impl ExprCollector {
.map(|arm| MatchArm {
pats: arm.pats().map(|p| self.collect_pat(p)).collect(),
expr: self.collect_expr_opt(arm.expr()),
guard: arm.guard().map(|guard| {
let e = guard.expr().expect("every guard should have an expr");
self.collect_expr(e)
}),
})
.collect()
} else {