Skip to content

Commit cfb7d3a

Browse files
bors[bot]Veykril
bors[bot]
and
Veykril
authored
Merge #9699
9699: fix: Fix generic_arg not parsing opt_generic_arg_list properly in arg lists r=Veykril a=Veykril Fixes #9697 bors r+ Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2 parents d571ca8 + f43cd56 commit cfb7d3a

File tree

3 files changed

+81
-67
lines changed

3 files changed

+81
-67
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,13 @@ fn generic_arg(p: &mut Parser) {
6565
m.complete(p, LIFETIME_ARG);
6666
}
6767
// test associated_type_bounds
68-
// fn print_all<T: Iterator<Item, Item::Item, Item: Display, Item<'a> = Item>>(printables: T) {}
68+
// fn print_all<T: Iterator<Item, Item::Item, Item::<true>, Item: Display, Item<'a> = Item>>(printables: T) {}
6969
IDENT if [T![<], T![=], T![:]].contains(&p.nth(1)) => {
7070
let path_ty = p.start();
7171
let path = p.start();
7272
let path_seg = p.start();
7373
name_ref(p);
74-
if p.current() == T![<] {
75-
opt_generic_arg_list(p, false);
76-
}
74+
opt_generic_arg_list(p, false);
7775
match p.current() {
7876
// NameRef<...> =
7977
T![=] => {
@@ -89,6 +87,7 @@ fn generic_arg(p: &mut Parser) {
8987
// NameRef::, this is a path type
9088
path_seg.complete(p, PATH_SEGMENT);
9189
let qual = path.complete(p, PATH);
90+
opt_generic_arg_list(p, false);
9291
paths::type_path_for_qualifier(p, qual);
9392
path_ty.complete(p, PATH_TYPE);
9493
m.complete(p, TYPE_ARG);

‎crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rast

Lines changed: 77 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
SOURCE_FILE@0..94
2-
FN@0..93
1+
SOURCE_FILE@0..108
2+
FN@0..107
33
FN_KW@0..2 "fn"
44
WHITESPACE@2..3 " "
55
NAME@3..12
66
IDENT@3..12 "print_all"
7-
GENERIC_PARAM_LIST@12..75
7+
GENERIC_PARAM_LIST@12..89
88
L_ANGLE@12..13 "<"
9-
TYPE_PARAM@13..74
9+
TYPE_PARAM@13..88
1010
NAME@13..14
1111
IDENT@13..14 "T"
1212
COLON@14..15 ":"
1313
WHITESPACE@15..16 " "
14-
TYPE_BOUND_LIST@16..74
15-
TYPE_BOUND@16..74
16-
PATH_TYPE@16..74
17-
PATH@16..74
18-
PATH_SEGMENT@16..74
14+
TYPE_BOUND_LIST@16..88
15+
TYPE_BOUND@16..88
16+
PATH_TYPE@16..88
17+
PATH@16..88
18+
PATH_SEGMENT@16..88
1919
NAME_REF@16..24
2020
IDENT@16..24 "Iterator"
21-
GENERIC_ARG_LIST@24..74
21+
GENERIC_ARG_LIST@24..88
2222
L_ANGLE@24..25 "<"
2323
TYPE_ARG@25..29
2424
PATH_TYPE@25..29
@@ -41,55 +41,70 @@ SOURCE_FILE@0..94
4141
IDENT@37..41 "Item"
4242
COMMA@41..42 ","
4343
WHITESPACE@42..43 " "
44-
ASSOC_TYPE_ARG@43..56
45-
NAME_REF@43..47
46-
IDENT@43..47 "Item"
47-
COLON@47..48 ":"
48-
WHITESPACE@48..49 " "
49-
TYPE_BOUND_LIST@49..56
50-
TYPE_BOUND@49..56
51-
PATH_TYPE@49..56
52-
PATH@49..56
53-
PATH_SEGMENT@49..56
54-
NAME_REF@49..56
55-
IDENT@49..56 "Display"
56-
COMMA@56..57 ","
57-
WHITESPACE@57..58 " "
58-
ASSOC_TYPE_ARG@58..73
59-
NAME_REF@58..62
60-
IDENT@58..62 "Item"
61-
GENERIC_ARG_LIST@62..66
62-
L_ANGLE@62..63 "<"
63-
LIFETIME_ARG@63..65
64-
LIFETIME@63..65
65-
LIFETIME_IDENT@63..65 "'a"
66-
R_ANGLE@65..66 ">"
67-
WHITESPACE@66..67 " "
68-
EQ@67..68 "="
69-
WHITESPACE@68..69 " "
70-
PATH_TYPE@69..73
71-
PATH@69..73
72-
PATH_SEGMENT@69..73
73-
NAME_REF@69..73
74-
IDENT@69..73 "Item"
75-
R_ANGLE@73..74 ">"
76-
R_ANGLE@74..75 ">"
77-
PARAM_LIST@75..90
78-
L_PAREN@75..76 "("
79-
PARAM@76..89
80-
IDENT_PAT@76..86
81-
NAME@76..86
82-
IDENT@76..86 "printables"
83-
COLON@86..87 ":"
84-
WHITESPACE@87..88 " "
85-
PATH_TYPE@88..89
86-
PATH@88..89
87-
PATH_SEGMENT@88..89
88-
NAME_REF@88..89
89-
IDENT@88..89 "T"
90-
R_PAREN@89..90 ")"
91-
WHITESPACE@90..91 " "
92-
BLOCK_EXPR@91..93
93-
L_CURLY@91..92 "{"
94-
R_CURLY@92..93 "}"
95-
WHITESPACE@93..94 "\n"
44+
TYPE_ARG@43..55
45+
PATH_TYPE@43..55
46+
PATH@43..55
47+
PATH_SEGMENT@43..55
48+
NAME_REF@43..47
49+
IDENT@43..47 "Item"
50+
GENERIC_ARG_LIST@47..55
51+
COLON2@47..49 "::"
52+
L_ANGLE@49..50 "<"
53+
CONST_ARG@50..54
54+
LITERAL@50..54
55+
TRUE_KW@50..54 "true"
56+
R_ANGLE@54..55 ">"
57+
COMMA@55..56 ","
58+
WHITESPACE@56..57 " "
59+
ASSOC_TYPE_ARG@57..70
60+
NAME_REF@57..61
61+
IDENT@57..61 "Item"
62+
COLON@61..62 ":"
63+
WHITESPACE@62..63 " "
64+
TYPE_BOUND_LIST@63..70
65+
TYPE_BOUND@63..70
66+
PATH_TYPE@63..70
67+
PATH@63..70
68+
PATH_SEGMENT@63..70
69+
NAME_REF@63..70
70+
IDENT@63..70 "Display"
71+
COMMA@70..71 ","
72+
WHITESPACE@71..72 " "
73+
ASSOC_TYPE_ARG@72..87
74+
NAME_REF@72..76
75+
IDENT@72..76 "Item"
76+
GENERIC_ARG_LIST@76..80
77+
L_ANGLE@76..77 "<"
78+
LIFETIME_ARG@77..79
79+
LIFETIME@77..79
80+
LIFETIME_IDENT@77..79 "'a"
81+
R_ANGLE@79..80 ">"
82+
WHITESPACE@80..81 " "
83+
EQ@81..82 "="
84+
WHITESPACE@82..83 " "
85+
PATH_TYPE@83..87
86+
PATH@83..87
87+
PATH_SEGMENT@83..87
88+
NAME_REF@83..87
89+
IDENT@83..87 "Item"
90+
R_ANGLE@87..88 ">"
91+
R_ANGLE@88..89 ">"
92+
PARAM_LIST@89..104
93+
L_PAREN@89..90 "("
94+
PARAM@90..103
95+
IDENT_PAT@90..100
96+
NAME@90..100
97+
IDENT@90..100 "printables"
98+
COLON@100..101 ":"
99+
WHITESPACE@101..102 " "
100+
PATH_TYPE@102..103
101+
PATH@102..103
102+
PATH_SEGMENT@102..103
103+
NAME_REF@102..103
104+
IDENT@102..103 "T"
105+
R_PAREN@103..104 ")"
106+
WHITESPACE@104..105 " "
107+
BLOCK_EXPR@105..107
108+
L_CURLY@105..106 "{"
109+
R_CURLY@106..107 "}"
110+
WHITESPACE@107..108 "\n"

‎crates/syntax/test_data/parser/inline/ok/0138_associated_type_bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fn print_all<T: Iterator<Item, Item::Item, Item: Display, Item<'a> = Item>>(printables: T) {}
1+
fn print_all<T: Iterator<Item, Item::Item, Item::<true>, Item: Display, Item<'a> = Item>>(printables: T) {}

0 commit comments

Comments
 (0)