Skip to content

Commit ed84717

Browse files
matkladmatklad
committed
internal: better naming
1 parent 3dc2aee commit ed84717

File tree

9 files changed

+60
-60
lines changed

9 files changed

+60
-60
lines changed

‎crates/parser/src/grammar.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ mod items;
3434
mod params;
3535
mod paths;
3636
mod patterns;
37-
mod type_args;
38-
mod type_params;
37+
mod generic_args;
38+
mod generic_params;
3939
mod types;
4040

4141
use crate::{

‎crates/parser/src/grammar/expressions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
486486
let m = lhs.precede(p);
487487
p.bump_any();
488488
name_ref(p);
489-
type_args::opt_generic_arg_list(p, true);
489+
generic_args::opt_generic_arg_list(p, true);
490490
if p.at(T!['(']) {
491491
arg_list(p);
492492
}

‎crates/parser/src/grammar/type_args.rs‎ renamed to ‎crates/parser/src/grammar/generic_args.rs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,38 +23,6 @@ pub(super) fn opt_generic_arg_list(p: &mut Parser, colon_colon_required: bool) {
2323
m.complete(p, GENERIC_ARG_LIST);
2424
}
2525

26-
pub(super) fn const_arg(p: &mut Parser) {
27-
let m = p.start();
28-
// FIXME: duplicates the code below
29-
match p.current() {
30-
T!['{'] => {
31-
expressions::block_expr(p);
32-
m.complete(p, CONST_ARG);
33-
}
34-
k if k.is_literal() => {
35-
expressions::literal(p);
36-
m.complete(p, CONST_ARG);
37-
}
38-
T![true] | T![false] => {
39-
expressions::literal(p);
40-
m.complete(p, CONST_ARG);
41-
}
42-
T![-] => {
43-
let lm = p.start();
44-
p.bump(T![-]);
45-
expressions::literal(p);
46-
lm.complete(p, PREFIX_EXPR);
47-
m.complete(p, CONST_ARG);
48-
}
49-
_ => {
50-
let lm = p.start();
51-
paths::use_path(p);
52-
lm.complete(p, PATH_EXPR);
53-
m.complete(p, CONST_ARG);
54-
}
55-
}
56-
}
57-
5826
// test type_arg
5927
// type A = B<'static, i32, 1, { 2 }, Item=u64, true, false>;
6028
fn generic_arg(p: &mut Parser) {
@@ -94,7 +62,7 @@ fn generic_arg(p: &mut Parser) {
9462
}
9563
// NameRef<...>:
9664
T![:] => {
97-
type_params::bounds(p);
65+
generic_params::bounds(p);
9866

9967
path_seg.abandon(p);
10068
path.abandon(p);
@@ -137,3 +105,35 @@ fn generic_arg(p: &mut Parser) {
137105
}
138106
}
139107
}
108+
109+
pub(super) fn const_arg(p: &mut Parser) {
110+
let m = p.start();
111+
// FIXME: duplicates the code above
112+
match p.current() {
113+
T!['{'] => {
114+
expressions::block_expr(p);
115+
m.complete(p, CONST_ARG);
116+
}
117+
k if k.is_literal() => {
118+
expressions::literal(p);
119+
m.complete(p, CONST_ARG);
120+
}
121+
T![true] | T![false] => {
122+
expressions::literal(p);
123+
m.complete(p, CONST_ARG);
124+
}
125+
T![-] => {
126+
let lm = p.start();
127+
p.bump(T![-]);
128+
expressions::literal(p);
129+
lm.complete(p, PREFIX_EXPR);
130+
m.complete(p, CONST_ARG);
131+
}
132+
_ => {
133+
let lm = p.start();
134+
paths::use_path(p);
135+
lm.complete(p, PATH_EXPR);
136+
m.complete(p, CONST_ARG);
137+
}
138+
}
139+
}

‎crates/parser/src/grammar/type_params.rs‎ renamed to ‎crates/parser/src/grammar/generic_params.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ fn const_param(p: &mut Parser, m: Marker) {
8282
// struct B<const N: i32 = {}>;
8383
// struct C<const N: i32 = some::CONST>;
8484
p.bump(T![=]);
85-
type_args::const_arg(p);
85+
generic_args::const_arg(p);
8686
}
8787

8888
m.complete(p, CONST_PARAM);

‎crates/parser/src/grammar/items.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,15 @@ fn type_alias(p: &mut Parser, m: Marker) {
284284

285285
// test type_item_type_params
286286
// type Result<T> = ();
287-
type_params::opt_generic_param_list(p);
287+
generic_params::opt_generic_param_list(p);
288288

289289
if p.at(T![:]) {
290-
type_params::bounds(p);
290+
generic_params::bounds(p);
291291
}
292292

293293
// test type_item_where_clause
294294
// type Foo where Foo: Copy = ();
295-
type_params::opt_where_clause(p);
295+
generic_params::opt_where_clause(p);
296296
if p.eat(T![=]) {
297297
types::type_(p);
298298
}
@@ -383,7 +383,7 @@ fn fn_(p: &mut Parser, m: Marker) {
383383
name_r(p, ITEM_RECOVERY_SET);
384384
// test function_type_params
385385
// fn foo<T: Clone + Copy>(){}
386-
type_params::opt_generic_param_list(p);
386+
generic_params::opt_generic_param_list(p);
387387

388388
if p.at(T!['(']) {
389389
params::param_list_fn_def(p);
@@ -397,7 +397,7 @@ fn fn_(p: &mut Parser, m: Marker) {
397397

398398
// test function_where_clause
399399
// fn foo<T>() where T: Copy {}
400-
type_params::opt_where_clause(p);
400+
generic_params::opt_where_clause(p);
401401

402402
if p.at(T![;]) {
403403
// test fn_decl

‎crates/parser/src/grammar/items/adt.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ pub(super) fn union(p: &mut Parser, m: Marker) {
1717

1818
fn struct_or_union(p: &mut Parser, m: Marker, is_struct: bool) {
1919
name_r(p, ITEM_RECOVERY_SET);
20-
type_params::opt_generic_param_list(p);
20+
generic_params::opt_generic_param_list(p);
2121
match p.current() {
2222
T![where] => {
23-
type_params::opt_where_clause(p);
23+
generic_params::opt_where_clause(p);
2424
match p.current() {
2525
T![;] => p.bump(T![;]),
2626
T!['{'] => record_field_list(p),
@@ -42,7 +42,7 @@ fn struct_or_union(p: &mut Parser, m: Marker, is_struct: bool) {
4242
tuple_field_list(p);
4343
// test tuple_struct_where
4444
// struct S<T>(T) where T: Clone;
45-
type_params::opt_where_clause(p);
45+
generic_params::opt_where_clause(p);
4646
p.expect(T![;]);
4747
}
4848
_ => p.error(if is_struct { "expected `;`, `{`, or `(`" } else { "expected `{`" }),
@@ -53,8 +53,8 @@ fn struct_or_union(p: &mut Parser, m: Marker, is_struct: bool) {
5353
pub(super) fn enum_(p: &mut Parser, m: Marker) {
5454
p.bump(T![enum]);
5555
name_r(p, ITEM_RECOVERY_SET);
56-
type_params::opt_generic_param_list(p);
57-
type_params::opt_where_clause(p);
56+
generic_params::opt_generic_param_list(p);
57+
generic_params::opt_where_clause(p);
5858
if p.at(T!['{']) {
5959
variant_list(p);
6060
} else {

‎crates/parser/src/grammar/items/traits.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ pub(super) fn trait_(p: &mut Parser, m: Marker) {
88

99
// test trait_item_generic_params
1010
// trait X<U: Debug + Display> {}
11-
type_params::opt_generic_param_list(p);
11+
generic_params::opt_generic_param_list(p);
1212

1313
if p.eat(T![=]) {
1414
// test trait_alias
1515
// trait Z<U> = T<U>;
16-
type_params::bounds_without_colon(p);
16+
generic_params::bounds_without_colon(p);
1717

1818
// test trait_alias_where_clause
1919
// trait Z<U> = T<U> where U: Copy;
2020
// trait Z<U> = where Self: T<U>;
21-
type_params::opt_where_clause(p);
21+
generic_params::opt_where_clause(p);
2222
p.expect(T![;]);
2323
m.complete(p, TRAIT);
2424
return;
@@ -27,12 +27,12 @@ pub(super) fn trait_(p: &mut Parser, m: Marker) {
2727
if p.at(T![:]) {
2828
// test trait_item_bounds
2929
// trait T: Hash + Clone {}
30-
type_params::bounds(p);
30+
generic_params::bounds(p);
3131
}
3232

3333
// test trait_item_where_clause
3434
// trait T where Self: Copy {}
35-
type_params::opt_where_clause(p);
35+
generic_params::opt_where_clause(p);
3636

3737
if p.at(T!['{']) {
3838
assoc_item_list(p);
@@ -47,7 +47,7 @@ pub(super) fn trait_(p: &mut Parser, m: Marker) {
4747
pub(super) fn impl_(p: &mut Parser, m: Marker) {
4848
p.bump(T![impl]);
4949
if p.at(T![<]) && not_a_qualified_path(p) {
50-
type_params::opt_generic_param_list(p);
50+
generic_params::opt_generic_param_list(p);
5151
}
5252

5353
// test impl_item_const
@@ -64,7 +64,7 @@ pub(super) fn impl_(p: &mut Parser, m: Marker) {
6464
if p.eat(T![for]) {
6565
impl_type(p);
6666
}
67-
type_params::opt_where_clause(p);
67+
generic_params::opt_where_clause(p);
6868
if p.at(T!['{']) {
6969
assoc_item_list(p);
7070
} else {

‎crates/parser/src/grammar/paths.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ fn opt_path_type_args(p: &mut Parser, mode: Mode) {
117117
params::param_list_fn_trait(p);
118118
opt_ret_type(p);
119119
} else {
120-
type_args::opt_generic_arg_list(p, false)
120+
generic_args::opt_generic_arg_list(p, false)
121121
}
122122
}
123-
Mode::Expr => type_args::opt_generic_arg_list(p, true),
123+
Mode::Expr => generic_args::opt_generic_arg_list(p, true),
124124
}
125125
}

‎crates/parser/src/grammar/types.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ pub(super) fn for_binder(p: &mut Parser) {
216216
assert!(p.at(T![for]));
217217
p.bump(T![for]);
218218
if p.at(T![<]) {
219-
type_params::opt_generic_param_list(p);
219+
generic_params::opt_generic_param_list(p);
220220
} else {
221221
p.error("expected `<`");
222222
}
@@ -254,7 +254,7 @@ fn impl_trait_type(p: &mut Parser) {
254254
assert!(p.at(T![impl]));
255255
let m = p.start();
256256
p.bump(T![impl]);
257-
type_params::bounds_without_colon(p);
257+
generic_params::bounds_without_colon(p);
258258
m.complete(p, IMPL_TRAIT_TYPE);
259259
}
260260

@@ -264,7 +264,7 @@ fn dyn_trait_type(p: &mut Parser) {
264264
assert!(p.at(T![dyn]));
265265
let m = p.start();
266266
p.bump(T![dyn]);
267-
type_params::bounds_without_colon(p);
267+
generic_params::bounds_without_colon(p);
268268
m.complete(p, DYN_TRAIT_TYPE);
269269
}
270270

@@ -339,7 +339,7 @@ fn opt_type_bounds_as_dyn_trait_type(p: &mut Parser, type_marker: CompletedMarke
339339
p.eat(T![+]);
340340

341341
// Parse rest of the bounds into the TYPE_BOUND_LIST
342-
let m = type_params::bounds_without_colon_m(p, m);
342+
let m = generic_params::bounds_without_colon_m(p, m);
343343

344344
// Finally precede everything with DYN_TRAIT_TYPE
345345
m.precede(p).complete(p, DYN_TRAIT_TYPE);

0 commit comments

Comments
 (0)