From d1400e95d7ad701fcba1191cb00968c2eae8b394 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 31 Jul 2018 23:16:07 +0300 Subject: renames --- src/parser/grammar/items/mod.rs | 6 +++--- src/parser/grammar/items/structs.rs | 4 ++-- src/parser/grammar/items/traits.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/parser/grammar/items') 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) { name(p); // test fn_item_type_params // fn foo(){} - type_params::list(p); + type_params::type_param_list(p); if p.at(L_PAREN) { - params::list(p); + params::param_list(p); } else { p.error("expected function arguments"); } @@ -265,7 +265,7 @@ fn type_item(p: &mut Parser) { // test type_item_type_params // type Result = (); - type_params::list(p); + type_params::type_param_list(p); // test type_item_where_clause // 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) { p.bump(); name(p); - type_params::list(p); + type_params::type_param_list(p); match p.current() { WHERE_KW => { type_params::where_clause(p); @@ -42,7 +42,7 @@ pub(super) fn enum_item(p: &mut Parser) { assert!(p.at(ENUM_KW)); p.bump(); name(p); - type_params::list(p); + type_params::type_param_list(p); type_params::where_clause(p); if p.expect(L_CURLY) { 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) { assert!(p.at(TRAIT_KW)); p.bump(); name(p); - type_params::list(p); + type_params::type_param_list(p); if p.at(COLON) { type_params::bounds(p); } @@ -21,7 +21,7 @@ pub(super) fn impl_item(p: &mut Parser) { assert!(p.at(IMPL_KW)); p.bump(); if choose_type_params_over_qpath(p) { - type_params::list(p); + type_params::type_param_list(p); } // TODO: never type -- cgit v1.2.3