language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

don't try to treat arrays and tuples as literals

Browse source
This commit is contained in:
Marcus Klaas de Vries 2019-01-11 09:47:31 +01:00
parent 1574715be5
commit 81bc8e4973
5 changed files with 27 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -115,8 +115,6 @@ pub enum Literal {
Bool(bool),
Int(u64, UncertainIntTy),
Float(u64, UncertainFloatTy), // FIXME: f64 is not Eq
Tuple { values: Vec<ExprId> },
Array { values: Vec<ExprId> },
}
#[derive(Debug, Clone, Eq, PartialEq)]
@ -322,14 +320,7 @@ impl Expr {
f(*expr);
}
}
Expr::Literal(l) => match l {
Literal::Array { values } | Literal::Tuple { values } => {
for &val in values {
f(val);
}
}
_ => {}
},
Expr::Literal(_) => {}
}
}
}
@ -720,14 +711,6 @@ impl ExprCollector {
let text = c.text().to_string();
Literal::String(text)
}
SyntaxKind::ARRAY_EXPR => {
// TODO: recursively call to self
Literal::Array { values: vec![] }
}
SyntaxKind::PAREN_EXPR => {
// TODO: recursively call to self
Literal::Tuple { values: vec![] }
}
SyntaxKind::TRUE_KW => Literal::Bool(true),
SyntaxKind::FALSE_KW => Literal::Bool(false),
SyntaxKind::BYTE_STRING => {