diff options
Diffstat (limited to 'crates/ra_parser/src/grammar.rs')
-rw-r--r-- | crates/ra_parser/src/grammar.rs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index a2ad580bc..89f4b63ec 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs | |||
@@ -93,12 +93,12 @@ pub(crate) mod fragments { | |||
93 | // https://doc.rust-lang.org/reference/paths.html#simple-paths | 93 | // https://doc.rust-lang.org/reference/paths.html#simple-paths |
94 | // The start of an meta must be a simple path | 94 | // The start of an meta must be a simple path |
95 | match p.current() { | 95 | match p.current() { |
96 | IDENT | T![::] | T![super] | T![self] | T![crate] => p.bump(), | 96 | IDENT | T![::] | T![super] | T![self] | T![crate] => p.bump_any(), |
97 | T![=] => { | 97 | T![=] => { |
98 | p.bump(); | 98 | p.bump_any(); |
99 | match p.current() { | 99 | match p.current() { |
100 | c if c.is_literal() => p.bump(), | 100 | c if c.is_literal() => p.bump_any(), |
101 | T![true] | T![false] => p.bump(), | 101 | T![true] | T![false] => p.bump_any(), |
102 | _ => {} | 102 | _ => {} |
103 | } | 103 | } |
104 | break; | 104 | break; |
@@ -126,7 +126,7 @@ pub(crate) mod fragments { | |||
126 | 126 | ||
127 | while !p.at(EOF) { | 127 | while !p.at(EOF) { |
128 | if p.at(T![;]) { | 128 | if p.at(T![;]) { |
129 | p.bump(); | 129 | p.bump_any(); |
130 | continue; | 130 | continue; |
131 | } | 131 | } |
132 | 132 | ||
@@ -179,7 +179,7 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
179 | match p.current() { | 179 | match p.current() { |
180 | T![pub] => { | 180 | T![pub] => { |
181 | let m = p.start(); | 181 | let m = p.start(); |
182 | p.bump(); | 182 | p.bump_any(); |
183 | if p.at(T!['(']) { | 183 | if p.at(T!['(']) { |
184 | match p.nth(1) { | 184 | match p.nth(1) { |
185 | // test crate_visibility | 185 | // test crate_visibility |
@@ -188,13 +188,13 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
188 | // pub(self) struct S; | 188 | // pub(self) struct S; |
189 | // pub(self) struct S; | 189 | // pub(self) struct S; |
190 | T![crate] | T![self] | T![super] => { | 190 | T![crate] | T![self] | T![super] => { |
191 | p.bump(); | 191 | p.bump_any(); |
192 | p.bump(); | 192 | p.bump_any(); |
193 | p.expect(T![')']); | 193 | p.expect(T![')']); |
194 | } | 194 | } |
195 | T![in] => { | 195 | T![in] => { |
196 | p.bump(); | 196 | p.bump_any(); |
197 | p.bump(); | 197 | p.bump_any(); |
198 | paths::use_path(p); | 198 | paths::use_path(p); |
199 | p.expect(T![')']); | 199 | p.expect(T![')']); |
200 | } | 200 | } |
@@ -212,7 +212,7 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
212 | // fn foo() { crate::foo(); } | 212 | // fn foo() { crate::foo(); } |
213 | T![crate] if p.nth(1) != T![::] => { | 213 | T![crate] if p.nth(1) != T![::] => { |
214 | let m = p.start(); | 214 | let m = p.start(); |
215 | p.bump(); | 215 | p.bump_any(); |
216 | m.complete(p, VISIBILITY); | 216 | m.complete(p, VISIBILITY); |
217 | } | 217 | } |
218 | _ => return false, | 218 | _ => return false, |
@@ -223,7 +223,7 @@ fn opt_visibility(p: &mut Parser) -> bool { | |||
223 | fn opt_alias(p: &mut Parser) { | 223 | fn opt_alias(p: &mut Parser) { |
224 | if p.at(T![as]) { | 224 | if p.at(T![as]) { |
225 | let m = p.start(); | 225 | let m = p.start(); |
226 | p.bump(); | 226 | p.bump_any(); |
227 | if !p.eat(T![_]) { | 227 | if !p.eat(T![_]) { |
228 | name(p); | 228 | name(p); |
229 | } | 229 | } |
@@ -234,9 +234,9 @@ fn opt_alias(p: &mut Parser) { | |||
234 | fn abi(p: &mut Parser) { | 234 | fn abi(p: &mut Parser) { |
235 | assert!(p.at(T![extern])); | 235 | assert!(p.at(T![extern])); |
236 | let abi = p.start(); | 236 | let abi = p.start(); |
237 | p.bump(); | 237 | p.bump_any(); |
238 | match p.current() { | 238 | match p.current() { |
239 | STRING | RAW_STRING => p.bump(), | 239 | STRING | RAW_STRING => p.bump_any(), |
240 | _ => (), | 240 | _ => (), |
241 | } | 241 | } |
242 | abi.complete(p, ABI); | 242 | abi.complete(p, ABI); |
@@ -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(); | 248 | p.bump_any(); |
249 | types::type_(p); | 249 | types::type_(p); |
250 | m.complete(p, RET_TYPE); | 250 | m.complete(p, RET_TYPE); |
251 | true | 251 | true |
@@ -257,7 +257,7 @@ fn opt_fn_ret_type(p: &mut Parser) -> bool { | |||
257 | fn name_r(p: &mut Parser, recovery: TokenSet) { | 257 | fn name_r(p: &mut Parser, recovery: TokenSet) { |
258 | if p.at(IDENT) { | 258 | if p.at(IDENT) { |
259 | let m = p.start(); | 259 | let m = p.start(); |
260 | p.bump(); | 260 | p.bump_any(); |
261 | m.complete(p, NAME); | 261 | m.complete(p, NAME); |
262 | } else { | 262 | } else { |
263 | p.err_recover("expected a name", recovery); | 263 | p.err_recover("expected a name", recovery); |
@@ -271,11 +271,11 @@ fn name(p: &mut Parser) { | |||
271 | fn name_ref(p: &mut Parser) { | 271 | fn name_ref(p: &mut Parser) { |
272 | if p.at(IDENT) { | 272 | if p.at(IDENT) { |
273 | let m = p.start(); | 273 | let m = p.start(); |
274 | p.bump(); | 274 | p.bump_any(); |
275 | m.complete(p, NAME_REF); | 275 | m.complete(p, NAME_REF); |
276 | } else if p.at(T![self]) { | 276 | } else if p.at(T![self]) { |
277 | let m = p.start(); | 277 | let m = p.start(); |
278 | p.bump(); | 278 | p.bump_any(); |
279 | m.complete(p, T![self]); | 279 | m.complete(p, T![self]); |
280 | } else { | 280 | } else { |
281 | p.err_and_bump("expected identifier"); | 281 | p.err_and_bump("expected identifier"); |
@@ -285,7 +285,7 @@ fn name_ref(p: &mut Parser) { | |||
285 | fn name_ref_or_index(p: &mut Parser) { | 285 | fn name_ref_or_index(p: &mut Parser) { |
286 | if p.at(IDENT) || p.at(INT_NUMBER) { | 286 | if p.at(IDENT) || p.at(INT_NUMBER) { |
287 | let m = p.start(); | 287 | let m = p.start(); |
288 | p.bump(); | 288 | p.bump_any(); |
289 | m.complete(p, NAME_REF); | 289 | m.complete(p, NAME_REF); |
290 | } else { | 290 | } else { |
291 | p.err_and_bump("expected identifier"); | 291 | p.err_and_bump("expected identifier"); |
@@ -296,7 +296,7 @@ fn error_block(p: &mut Parser, message: &str) { | |||
296 | assert!(p.at(T!['{'])); | 296 | assert!(p.at(T!['{'])); |
297 | let m = p.start(); | 297 | let m = p.start(); |
298 | p.error(message); | 298 | p.error(message); |
299 | p.bump(); | 299 | p.bump_any(); |
300 | expressions::expr_block_contents(p); | 300 | expressions::expr_block_contents(p); |
301 | p.eat(T!['}']); | 301 | p.eat(T!['}']); |
302 | m.complete(p, ERROR); | 302 | m.complete(p, ERROR); |