diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-10 20:14:08 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-02-10 20:14:08 +0000 |
commit | f8d6d6f23bfb15021be91031ba983da19f0d3ada (patch) | |
tree | 9c6ab9425ba72c440b2a475d92ed984ccf1aebcc /crates/ra_parser/src/grammar/params.rs | |
parent | 29f5e7eebf606c1929d5a77ad66624cd4f3fcf49 (diff) | |
parent | 49b53cd7a0861cdba65643e3da441eefbe18d6e6 (diff) |
Merge #3074
3074: Or patterns r=matthewjasper a=matthewjasper
Works towards #2458
Co-authored-by: Matthew Jasper <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar/params.rs')
-rw-r--r-- | crates/ra_parser/src/grammar/params.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar/params.rs b/crates/ra_parser/src/grammar/params.rs index 94edc7f35..ed4f93347 100644 --- a/crates/ra_parser/src/grammar/params.rs +++ b/crates/ra_parser/src/grammar/params.rs | |||
@@ -116,7 +116,7 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) { | |||
116 | // type Qux = fn(baz: Bar::Baz); | 116 | // type Qux = fn(baz: Bar::Baz); |
117 | Flavor::FnPointer => { | 117 | Flavor::FnPointer => { |
118 | if p.at(IDENT) && p.nth(1) == T![:] && !p.nth_at(1, T![::]) { | 118 | if p.at(IDENT) && p.nth(1) == T![:] && !p.nth_at(1, T![::]) { |
119 | patterns::pattern(p); | 119 | patterns::pattern_single(p); |
120 | types::ascription(p); | 120 | types::ascription(p); |
121 | } else { | 121 | } else { |
122 | types::type_(p); | 122 | types::type_(p); |
@@ -127,7 +127,7 @@ fn value_parameter(p: &mut Parser, flavor: Flavor) { | |||
127 | // let foo = |bar, baz: Baz, qux: Qux::Quux| (); | 127 | // let foo = |bar, baz: Baz, qux: Qux::Quux| (); |
128 | // } | 128 | // } |
129 | Flavor::Closure => { | 129 | Flavor::Closure => { |
130 | patterns::pattern(p); | 130 | patterns::pattern_single(p); |
131 | if p.at(T![:]) && !p.at(T![::]) { | 131 | if p.at(T![:]) && !p.at(T![::]) { |
132 | types::ascription(p); | 132 | types::ascription(p); |
133 | } | 133 | } |