diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-10 14:01:44 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-10 14:01:44 +0100 |
commit | 9d3c78e2eee6635772c99d7351b621cefb08bac5 (patch) | |
tree | 14e74b81c7195bcd5b308e799c3fd447e76274ca /crates/ra_parser/src/grammar.rs | |
parent | e2ebb467bdf3ebb7d29260adb95c56594c6db282 (diff) | |
parent | ed726081d1df2fb6a1c21101996dcae203f79021 (diff) |
Merge #1801
1801: WIP: switch to fully decomposed tokens internally r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar.rs')
-rw-r--r-- | crates/ra_parser/src/grammar.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index 4e6f2f558..0158f9b8a 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs | |||
@@ -210,7 +210,7 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
210 | // | 210 | // |
211 | // test crate_keyword_path | 211 | // test crate_keyword_path |
212 | // fn foo() { crate::foo(); } | 212 | // fn foo() { crate::foo(); } |
213 | T![crate] if p.nth(1) != T![::] => { | 213 | T![crate] if !p.nth_at(1, T![::]) => { |
214 | let m = p.start(); | 214 | let m = p.start(); |
215 | p.bump_any(); | 215 | p.bump_any(); |
216 | m.complete(p, VISIBILITY); | 216 | m.complete(p, VISIBILITY); |
@@ -245,7 +245,7 @@ fn abi(p: &mut Parser) { | |||
245 | fn opt_fn_ret_type(p: &mut Parser) -> bool { | 245 | fn opt_fn_ret_type(p: &mut Parser) -> bool { |
246 | if p.at(T![->]) { | 246 | if p.at(T![->]) { |
247 | let m = p.start(); | 247 | let m = p.start(); |
248 | p.bump_any(); | 248 | p.bump(T![->]); |
249 | types::type_(p); | 249 | types::type_(p); |
250 | m.complete(p, RET_TYPE); | 250 | m.complete(p, RET_TYPE); |
251 | true | 251 | true |