diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-09-06 15:05:37 +0100 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-09-06 15:05:37 +0100 |
| commit | ba7b3c2108c13c20d3e279ff5f0bb4cc9522e08a (patch) | |
| tree | ac9a756c5cfc83fed671f57e20a2f05d8b00e539 /crates/libsyntax2/src/grammar | |
| parent | 751562d2f77a7bc3eeeffbf8e53c9f3515fa9653 (diff) | |
| parent | 518cc87496494d639f0a6bf189f1a3567bcfa328 (diff) | |
Merge #59
59: Moved TokenSet into it's own file. r=matklad a=Plasticcaz
As discussed in Issue #11, the only thing left in that issue that hasn't been fixed appears to be that TokenSet is not in it's own file. This pull request pulls TokenSet, it's macros and it's test into it's own file.
Co-authored-by: Zac Winter <[email protected]>
Diffstat (limited to 'crates/libsyntax2/src/grammar')
| -rw-r--r-- | crates/libsyntax2/src/grammar/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/libsyntax2/src/grammar/mod.rs b/crates/libsyntax2/src/grammar/mod.rs index 339664af3..e19805b9d 100644 --- a/crates/libsyntax2/src/grammar/mod.rs +++ b/crates/libsyntax2/src/grammar/mod.rs | |||
| @@ -32,7 +32,8 @@ mod type_params; | |||
| 32 | mod types; | 32 | mod types; |
| 33 | 33 | ||
| 34 | use { | 34 | use { |
| 35 | parser_api::{Marker, CompletedMarker, Parser, TokenSet}, | 35 | token_set::TokenSet, |
| 36 | parser_api::{Marker, CompletedMarker, Parser}, | ||
| 36 | SyntaxKind::{self, *}, | 37 | SyntaxKind::{self, *}, |
| 37 | }; | 38 | }; |
| 38 | pub(crate) use self::{ | 39 | pub(crate) use self::{ |