aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/expr.rs
diff options
context:
space:
mode:
authorMarcus Klaas de Vries <[email protected]>2019-01-11 08:47:31 +0000
committerMarcus Klaas de Vries <[email protected]>2019-01-14 12:55:49 +0000
commit81bc8e4973fefd0ff31d08206c374fb58aa8b6e0 (patch)
tree08c6df5a8b97cf7fb03d46b8ca8859b0be7a5de6 /crates/ra_hir/src/expr.rs
parent1574715be5d3fc7e07160708810dcbc9c1b01733 (diff)
don't try to treat arrays and tuples as literals
Diffstat (limited to 'crates/ra_hir/src/expr.rs')
-rw-r--r--crates/ra_hir/src/expr.rs19
1 files changed, 1 insertions, 18 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 2798937a6..52af2af45 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -115,8 +115,6 @@ pub enum Literal {
115 Bool(bool), 115 Bool(bool),
116 Int(u64, UncertainIntTy), 116 Int(u64, UncertainIntTy),
117 Float(u64, UncertainFloatTy), // FIXME: f64 is not Eq 117 Float(u64, UncertainFloatTy), // FIXME: f64 is not Eq
118 Tuple { values: Vec<ExprId> },
119 Array { values: Vec<ExprId> },
120} 118}
121 119
122#[derive(Debug, Clone, Eq, PartialEq)] 120#[derive(Debug, Clone, Eq, PartialEq)]
@@ -322,14 +320,7 @@ impl Expr {
322 f(*expr); 320 f(*expr);
323 } 321 }
324 } 322 }
325 Expr::Literal(l) => match l { 323 Expr::Literal(_) => {}
326 Literal::Array { values } | Literal::Tuple { values } => {
327 for &val in values {
328 f(val);
329 }
330 }
331 _ => {}
332 },
333 } 324 }
334 } 325 }
335} 326}
@@ -720,14 +711,6 @@ impl ExprCollector {
720 let text = c.text().to_string(); 711 let text = c.text().to_string();
721 Literal::String(text) 712 Literal::String(text)
722 } 713 }
723 SyntaxKind::ARRAY_EXPR => {
724 // TODO: recursively call to self
725 Literal::Array { values: vec![] }
726 }
727 SyntaxKind::PAREN_EXPR => {
728 // TODO: recursively call to self
729 Literal::Tuple { values: vec![] }
730 }
731 SyntaxKind::TRUE_KW => Literal::Bool(true), 714 SyntaxKind::TRUE_KW => Literal::Bool(true),
732 SyntaxKind::FALSE_KW => Literal::Bool(false), 715 SyntaxKind::FALSE_KW => Literal::Bool(false),
733 SyntaxKind::BYTE_STRING => { 716 SyntaxKind::BYTE_STRING => {