aboutsummaryrefslogtreecommitdiff
path: root/src/parser/grammar
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-07-30 12:08:06 +0100
committerAleksey Kladov <[email protected]>2018-07-30 12:08:06 +0100
commit1edb58a802f183f79dc2c4bc15921394ef8abb31 (patch)
tree24114171c61a9f433b9a54008057fa0297f91302 /src/parser/grammar
parent6983091d6d255bcfd17c4f8c14015d8abc77928d (diff)
reformat
Diffstat (limited to 'src/parser/grammar')
-rw-r--r--src/parser/grammar/items/mod.rs9
-rw-r--r--src/parser/grammar/mod.rs11
2 files changed, 8 insertions, 12 deletions
diff --git a/src/parser/grammar/items/mod.rs b/src/parser/grammar/items/mod.rs
index 1fe646652..5d8d57a80 100644
--- a/src/parser/grammar/items/mod.rs
+++ b/src/parser/grammar/items/mod.rs
@@ -1,9 +1,9 @@
1use super::*; 1use super::*;
2 2
3mod structs;
4mod use_item;
5mod consts; 3mod consts;
4mod structs;
6mod traits; 5mod traits;
6mod use_item;
7 7
8pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { 8pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
9 attributes::inner_attributes(p); 9 attributes::inner_attributes(p);
@@ -12,9 +12,8 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) {
12 } 12 }
13} 13}
14 14
15pub(super) const ITEM_FIRST: TokenSet = token_set![ 15pub(super) const ITEM_FIRST: TokenSet =
16 EXTERN_KW, MOD_KW, USE_KW, STRUCT_KW, ENUM_KW, FN_KW, PUB_KW, POUND 16 token_set![EXTERN_KW, MOD_KW, USE_KW, STRUCT_KW, ENUM_KW, FN_KW, PUB_KW, POUND];
17];
18 17
19fn item(p: &mut Parser) { 18fn item(p: &mut Parser) {
20 let item = p.start(); 19 let item = p.start();
diff --git a/src/parser/grammar/mod.rs b/src/parser/grammar/mod.rs
index 085e62d56..e24f1055e 100644
--- a/src/parser/grammar/mod.rs
+++ b/src/parser/grammar/mod.rs
@@ -21,20 +21,17 @@
21//! After adding a new inline-test, run `cargo collect-tests` to extract 21//! After adding a new inline-test, run `cargo collect-tests` to extract
22//! it as a standalone text-fixture into `tests/data/parser/inline`, and 22//! it as a standalone text-fixture into `tests/data/parser/inline`, and
23//! run `cargo test` once to create the "gold" value. 23//! run `cargo test` once to create the "gold" value.
24mod items;
25mod attributes; 24mod attributes;
26mod expressions; 25mod expressions;
27mod types; 26mod items;
28mod patterns;
29mod paths; 27mod paths;
28mod patterns;
30mod type_params; 29mod type_params;
30mod types;
31 31
32use { 32use {
33 parser::{parser::Parser, token_set::TokenSet},
33 SyntaxKind::{self, *}, 34 SyntaxKind::{self, *},
34 parser::{
35 parser::Parser,
36 token_set::TokenSet
37 }
38}; 35};
39 36
40pub(crate) fn file(p: &mut Parser) { 37pub(crate) fn file(p: &mut Parser) {