aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-13 13:25:33 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-13 13:25:33 +0000
commitff09d151241cf0bc14cd7ecb015350a77f882969 (patch)
tree54c6f372f0c5ae4ed91c4819182c1f2129da9141 /crates/ra_syntax
parentbd2658de2691cf6f322f525a60a0d84bc0b5efc6 (diff)
parent139da0841d720fc75a3c449c37f9e198cd7dcda9 (diff)
Merge #520
520: Imprement tuple inference r=flodiebold a=h-michael related #394 I'm sorry I'm late. I try implementing array inference next. Co-authored-by: Hirokazu Hata <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r--crates/ra_syntax/src/ast/generated.rs6
-rw-r--r--crates/ra_syntax/src/grammar.ron4
2 files changed, 8 insertions, 2 deletions
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs
index f745cb1cb..94842a514 100644
--- a/crates/ra_syntax/src/ast/generated.rs
+++ b/crates/ra_syntax/src/ast/generated.rs
@@ -2969,7 +2969,11 @@ impl AstNode for TupleExpr {
2969} 2969}
2970 2970
2971 2971
2972impl TupleExpr {} 2972impl TupleExpr {
2973 pub fn exprs(&self) -> impl Iterator<Item = &Expr> {
2974 super::children(self)
2975 }
2976}
2973 2977
2974// TuplePat 2978// TuplePat
2975#[derive(Debug, PartialEq, Eq, Hash)] 2979#[derive(Debug, PartialEq, Eq, Hash)]
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron
index bac62fa04..dfd88bd10 100644
--- a/crates/ra_syntax/src/grammar.ron
+++ b/crates/ra_syntax/src/grammar.ron
@@ -357,7 +357,9 @@ Grammar(
357 enum: ["FnDef", "TypeDef", "ConstDef"] 357 enum: ["FnDef", "TypeDef", "ConstDef"]
358 ), 358 ),
359 359
360 "TupleExpr": (), 360 "TupleExpr": (
361 collections: [["exprs", "Expr"]]
362 ),
361 "ArrayExpr": (), 363 "ArrayExpr": (),
362 "ParenExpr": (options: ["Expr"]), 364 "ParenExpr": (options: ["Expr"]),
363 "PathExpr": (options: ["Path"]), 365 "PathExpr": (options: ["Path"]),