diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
| commit | 16bbf4ab7f132e6e5e5318dccdef9a5d71afdd7f (patch) | |
| tree | 4b79fa8c046be56b02427ba843e70cdf3ac05767 /crates/ra_parser/src/grammar/paths.rs | |
| parent | eeb8b9e236796da8734ba81a49164864497f7226 (diff) | |
| parent | b56ad148db0c69eb279c225f45d324b4e80e7367 (diff) | |
Merge branch 'master' into keyword_completion
# Conflicts:
# docs/user/generated_features.adoc
Diffstat (limited to 'crates/ra_parser/src/grammar/paths.rs')
| -rw-r--r-- | crates/ra_parser/src/grammar/paths.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_parser/src/grammar/paths.rs b/crates/ra_parser/src/grammar/paths.rs index 332acc1a0..428aa711e 100644 --- a/crates/ra_parser/src/grammar/paths.rs +++ b/crates/ra_parser/src/grammar/paths.rs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | use super::*; | 3 | use super::*; |
| 4 | 4 | ||
| 5 | pub(super) const PATH_FIRST: TokenSet = | 5 | pub(super) const PATH_FIRST: TokenSet = |
| 6 | token_set![IDENT, SELF_KW, SUPER_KW, CRATE_KW, COLON, L_ANGLE]; | 6 | token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; |
| 7 | 7 | ||
| 8 | pub(super) fn is_path_start(p: &Parser) -> bool { | 8 | pub(super) fn is_path_start(p: &Parser) -> bool { |
| 9 | is_use_path_start(p) || p.at(T![<]) | 9 | is_use_path_start(p) || p.at(T![<]) |