language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-22 11:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace SyntaxKind usage with T! macro where applicable

Browse source
This commit is contained in:
Lukas Wirth 2021-01-10 16:40:52 +01:00
parent e1430d822e
commit e618d12903
12 changed files with 50 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/parser/src/grammar/expressions/atom.rs
View file

@ -15,8 +15,16 @@ use super::*;
// let _ = b"e";
// let _ = br"f";
// }
pub(crate) const LITERAL_FIRST: TokenSet =
TokenSet::new(&[TRUE_KW, FALSE_KW, INT_NUMBER, FLOAT_NUMBER, BYTE, CHAR, STRING, BYTE_STRING]);
pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[
T![true],
T![false],
INT_NUMBER,
FLOAT_NUMBER,
BYTE,
CHAR,
STRING,
BYTE_STRING,
]);
pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> {
if !p.at_ts(LITERAL_FIRST) {

26
crates/parser/src/grammar/items.rs
View file

@ -27,19 +27,19 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
}
pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[
FN_KW,
STRUCT_KW,
ENUM_KW,
IMPL_KW,
TRAIT_KW,
CONST_KW,
STATIC_KW,
LET_KW,
MOD_KW,
PUB_KW,
CRATE_KW,
USE_KW,
MACRO_KW,
T![fn],
T![struct],
T![enum],
T![impl],
T![trait],
T![const],
T![static],
T![let],
T![mod],
T![pub],
T![crate],
T![use],
T![macro],
T![;],
]);

2
crates/parser/src/grammar/items/traits.rs
View file

@ -110,7 +110,7 @@ fn choose_type_params_over_qpath(p: &Parser) -> bool {
if !p.at(T![<]) {
return false;
}
if p.nth(1) == T![#] || p.nth(1) == T![>] || p.nth(1) == CONST_KW {
if p.nth(1) == T![#] || p.nth(1) == T![>] || p.nth(1) == T![const] {
return true;
}
(p.nth(1) == LIFETIME_IDENT || p.nth(1) == IDENT)

2
crates/parser/src/grammar/patterns.rs
View file

@ -83,7 +83,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
}
const PAT_RECOVERY_SET: TokenSet =
TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]);
TokenSet::new(&[T![let], T![if], T![while], T![loop], T![match], T![')'], T![,]]);
fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> {
let m = match p.nth(0) {

4
crates/parser/src/grammar/type_params.rs
View file

@ -25,7 +25,7 @@ fn generic_param_list(p: &mut Parser) {
match p.current() {
LIFETIME_IDENT => lifetime_param(p, m),
IDENT => type_param(p, m),
CONST_KW => const_param(p, m),
T![const] => const_param(p, m),
_ => {
m.abandon(p);
p.err_and_bump("expected type parameter")
@ -66,7 +66,7 @@ fn type_param(p: &mut Parser, m: Marker) {
// test const_param
// struct S<const N: u32>;
fn const_param(p: &mut Parser, m: Marker) {
assert!(p.at(CONST_KW));
assert!(p.at(T![const]));
p.bump(T![const]);
name(p);
types::ascription(p);