diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-14 16:10:31 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-14 16:10:31 +0100 |
commit | 19e0d7d596015599fd705eecfe6f695aabc8632d (patch) | |
tree | 531ca24c725da983739477a146db7c823dae073b /crates/ra_parser/src/grammar/patterns.rs | |
parent | 978e3e384b045ea72ba952e7f94a2a4c82297e66 (diff) | |
parent | 8222a1fddfe73dab5e00437efeffa7d95db0b6be (diff) |
Merge #1676
1676: Fix for<'lifetime> for types specified by path r=matklad a=eupn
Fixes #1467.
Co-authored-by: Evgenii P <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar/patterns.rs')
-rw-r--r-- | crates/ra_parser/src/grammar/patterns.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs index 46034942a..df6000707 100644 --- a/crates/ra_parser/src/grammar/patterns.rs +++ b/crates/ra_parser/src/grammar/patterns.rs | |||
@@ -65,7 +65,7 @@ fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> { | |||
65 | { | 65 | { |
66 | return Some(bind_pat(p, true)); | 66 | return Some(bind_pat(p, true)); |
67 | } | 67 | } |
68 | if paths::is_path_start(p) { | 68 | if paths::is_use_path_start(p) { |
69 | return Some(path_pat(p)); | 69 | return Some(path_pat(p)); |
70 | } | 70 | } |
71 | 71 | ||
@@ -118,7 +118,7 @@ fn literal_pat(p: &mut Parser) -> CompletedMarker { | |||
118 | // let Bar(..) = (); | 118 | // let Bar(..) = (); |
119 | // } | 119 | // } |
120 | fn path_pat(p: &mut Parser) -> CompletedMarker { | 120 | fn path_pat(p: &mut Parser) -> CompletedMarker { |
121 | assert!(paths::is_path_start(p)); | 121 | assert!(paths::is_use_path_start(p)); |
122 | let m = p.start(); | 122 | let m = p.start(); |
123 | paths::expr_path(p); | 123 | paths::expr_path(p); |
124 | let kind = match p.current() { | 124 | let kind = match p.current() { |