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

Reduce variants of Expr

Browse source
This commit is contained in:
oxalica 2019-11-29 14:49:12 +08:00
parent 4992d2bf79
commit 2cb684bbce
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
3 changed files with 56 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/ra_hir_def/src/expr.rs
View file

@ -14,6 +14,7 @@
use hir_expand::name::Name;
use ra_arena::{impl_arena_id, RawId};
use ra_syntax::ast::RangeOp;
use crate::{
builtin_type::{BuiltinFloat, BuiltinInt},
@ -130,23 +131,10 @@ pub enum Expr {
rhs: ExprId,
op: Option<BinaryOp>,
},
RangeFull,
RangeFrom {
lhs: ExprId,
},
RangeTo {
rhs: ExprId,
},
Range {
lhs: ExprId,
rhs: ExprId,
},
RangeToInclusive {
rhs: ExprId,
},
RangeInclusive {
lhs: ExprId,
rhs: ExprId,
lhs: Option<ExprId>,
rhs: Option<ExprId>,
range_type: RangeOp,
},
Index {
base: ExprId,
@ -302,21 +290,23 @@ impl Expr {
Expr::Lambda { body, .. } => {
f(*body);
}
Expr::BinaryOp { lhs, rhs, .. }
| Expr::Range { lhs, rhs }
| Expr::RangeInclusive { lhs, rhs } => {
Expr::BinaryOp { lhs, rhs, .. } => {
f(*lhs);
f(*rhs);
}
Expr::Range { lhs, rhs, .. } => {
if let Some(lhs) = rhs {
f(*lhs);
}
if let Some(rhs) = lhs {
f(*rhs);
}
}
Expr::Index { base, index } => {
f(*base);
f(*index);
}
Expr::RangeFull => {}
Expr::RangeFrom { lhs: expr }
| Expr::RangeTo { rhs: expr }
| Expr::RangeToInclusive { rhs: expr }
| Expr::Field { expr, .. }
Expr::Field { expr, .. }
| Expr::Await { expr }
| Expr::Try { expr }
| Expr::Cast { expr, .. }