diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-15 08:02:51 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-15 08:02:51 +0100 |
commit | bcdba777bdc43762cff73ac3ded4ae737a503692 (patch) | |
tree | e65797200723aeb35afc10acb24a7a7d385d5c2b /crates/ra_parser/src/grammar/items | |
parent | 211171ffe6a4e8cbf31b9513972e59a8b9bdc811 (diff) | |
parent | c413f444a02ad7898b7a259e0d7aeaed91fd1997 (diff) |
Merge #1847
1847: Allow an underscore as the identifier in `const` items r=matklad a=ecstatic-morse
[RFC 2526](https://github.com/rust-lang/rust/issues/54912) was recently stabilized, meaning `const _: i32 = 5;` is now a valid item.
Co-authored-by: Dylan MacKenzie <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar/items')
-rw-r--r-- | crates/ra_parser/src/grammar/items/consts.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar/items/consts.rs b/crates/ra_parser/src/grammar/items/consts.rs index e11546333..63e0e6e0c 100644 --- a/crates/ra_parser/src/grammar/items/consts.rs +++ b/crates/ra_parser/src/grammar/items/consts.rs | |||
@@ -12,7 +12,16 @@ fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { | |||
12 | assert!(p.at(kw)); | 12 | assert!(p.at(kw)); |
13 | p.bump_any(); | 13 | p.bump_any(); |
14 | p.eat(T![mut]); // FIXME: validator to forbid const mut | 14 | p.eat(T![mut]); // FIXME: validator to forbid const mut |
15 | name(p); | 15 | |
16 | // Allow `_` in place of an identifier in a `const`. | ||
17 | let is_const_underscore = kw == T![const] && p.eat(T![_]); | ||
18 | if !is_const_underscore { | ||
19 | name(p); | ||
20 | } | ||
21 | |||
22 | // test_err static_underscore | ||
23 | // static _: i32 = 5; | ||
24 | |||
16 | types::ascription(p); | 25 | types::ascription(p); |
17 | if p.eat(T![=]) { | 26 | if p.eat(T![=]) { |
18 | expressions::expr(p); | 27 | expressions::expr(p); |