aboutsummaryrefslogtreecommitdiff
path: root/src/parser/grammar/items
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-07-31 21:16:07 +0100
committerAleksey Kladov <[email protected]>2018-07-31 21:16:07 +0100
commitd1400e95d7ad701fcba1191cb00968c2eae8b394 (patch)
tree8085d65e9b226592d334b117036cb7725a5d710f /src/parser/grammar/items
parent6953049e5f67dcc940cc4edc228c1be13a4624d1 (diff)
renames
Diffstat (limited to 'src/parser/grammar/items')
-rw-r--r--src/parser/grammar/items/mod.rs6
-rw-r--r--src/parser/grammar/items/structs.rs4
-rw-r--r--src/parser/grammar/items/traits.rs4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/parser/grammar/items/mod.rs b/src/parser/grammar/items/mod.rs
index 8c2704be5..d5f75f13d 100644
--- a/src/parser/grammar/items/mod.rs
+++ b/src/parser/grammar/items/mod.rs
@@ -236,10 +236,10 @@ fn fn_item(p: &mut Parser) {
236 name(p); 236 name(p);
237 // test fn_item_type_params 237 // test fn_item_type_params
238 // fn foo<T: Clone + Copy>(){} 238 // fn foo<T: Clone + Copy>(){}
239 type_params::list(p); 239 type_params::type_param_list(p);
240 240
241 if p.at(L_PAREN) { 241 if p.at(L_PAREN) {
242 params::list(p); 242 params::param_list(p);
243 } else { 243 } else {
244 p.error("expected function arguments"); 244 p.error("expected function arguments");
245 } 245 }
@@ -265,7 +265,7 @@ fn type_item(p: &mut Parser) {
265 265
266 // test type_item_type_params 266 // test type_item_type_params
267 // type Result<T> = (); 267 // type Result<T> = ();
268 type_params::list(p); 268 type_params::type_param_list(p);
269 269
270 // test type_item_where_clause 270 // test type_item_where_clause
271 // type Foo where Foo: Copy = (); 271 // type Foo where Foo: Copy = ();
diff --git a/src/parser/grammar/items/structs.rs b/src/parser/grammar/items/structs.rs
index c72b50808..7ced542a4 100644
--- a/src/parser/grammar/items/structs.rs
+++ b/src/parser/grammar/items/structs.rs
@@ -5,7 +5,7 @@ pub(super) fn struct_item(p: &mut Parser) {
5 p.bump(); 5 p.bump();
6 6
7 name(p); 7 name(p);
8 type_params::list(p); 8 type_params::type_param_list(p);
9 match p.current() { 9 match p.current() {
10 WHERE_KW => { 10 WHERE_KW => {
11 type_params::where_clause(p); 11 type_params::where_clause(p);
@@ -42,7 +42,7 @@ pub(super) fn enum_item(p: &mut Parser) {
42 assert!(p.at(ENUM_KW)); 42 assert!(p.at(ENUM_KW));
43 p.bump(); 43 p.bump();
44 name(p); 44 name(p);
45 type_params::list(p); 45 type_params::type_param_list(p);
46 type_params::where_clause(p); 46 type_params::where_clause(p);
47 if p.expect(L_CURLY) { 47 if p.expect(L_CURLY) {
48 while !p.at(EOF) && !p.at(R_CURLY) { 48 while !p.at(EOF) && !p.at(R_CURLY) {
diff --git a/src/parser/grammar/items/traits.rs b/src/parser/grammar/items/traits.rs
index 60158fe41..bda13e565 100644
--- a/src/parser/grammar/items/traits.rs
+++ b/src/parser/grammar/items/traits.rs
@@ -6,7 +6,7 @@ pub(super) fn trait_item(p: &mut Parser) {
6 assert!(p.at(TRAIT_KW)); 6 assert!(p.at(TRAIT_KW));
7 p.bump(); 7 p.bump();
8 name(p); 8 name(p);
9 type_params::list(p); 9 type_params::type_param_list(p);
10 if p.at(COLON) { 10 if p.at(COLON) {
11 type_params::bounds(p); 11 type_params::bounds(p);
12 } 12 }
@@ -21,7 +21,7 @@ pub(super) fn impl_item(p: &mut Parser) {
21 assert!(p.at(IMPL_KW)); 21 assert!(p.at(IMPL_KW));
22 p.bump(); 22 p.bump();
23 if choose_type_params_over_qpath(p) { 23 if choose_type_params_over_qpath(p) {
24 type_params::list(p); 24 type_params::type_param_list(p);
25 } 25 }
26 26
27 // TODO: never type 27 // TODO: never type