language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

minor: cleanup const parsing

Browse source
This commit is contained in:
Aleksey Kladov 2021-09-18 00:58:35 +03:00
parent 46326b8db7
commit 1feb8e89d5
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/parser/src/grammar/items/consts.rs
View file

@ -1,20 +1,20 @@
use super::*; use super::*;
pub(super) fn static_(p: &mut Parser, m: Marker) {
const_or_static(p, m, T![static], STATIC)
}
pub(super) fn konst(p: &mut Parser, m: Marker) { pub(super) fn konst(p: &mut Parser, m: Marker) {
const_or_static(p, m, T![const], CONST) p.bump(T![const]);
const_or_static(p, m, true)
} }
fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) { pub(super) fn static_(p: &mut Parser, m: Marker) {
assert!(p.at(kw)); p.bump(T![static]);
p.bump(kw); const_or_static(p, m, false)
}
fn const_or_static(p: &mut Parser, m: Marker, is_const: bool) {
p.eat(T![mut]); p.eat(T![mut]);
// Allow `_` in place of an identifier in a `const`. // Allow `_` in place of an identifier in a `const`.
let is_const_underscore = kw == T![const] && p.eat(T![_]); let is_const_underscore = is_const && p.eat(T![_]);
if !is_const_underscore { if !is_const_underscore {
name(p); name(p);
} }
@ -30,5 +30,5 @@ fn const_or_static(p: &mut Parser, m: Marker, kw: SyntaxKind, def: SyntaxKind) {
expressions::expr(p); expressions::expr(p);
} }
p.expect(T![;]); p.expect(T![;]);
m.complete(p, def); m.complete(p, if is_const { CONST } else { STATIC });
} }