Skip to content

Commit 8d24f0e

Browse files
bors[bot]xffxff
bors[bot]
and
xffxff
authored
Merge #10794
10794: fix: parse the range pat inside the tuple pat r=lnicola a=XFFXFF fixes #10784 Co-authored-by: zhoufan <[email protected]>
2 parents ea01a3a + a539b5e commit 8d24f0e

File tree

3 files changed

+168
-82
lines changed

3 files changed

+168
-82
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
7474
// Some(0) | None => (),
7575
// Some(1..) => ()
7676
// }
77+
//
78+
// match (10 as u8, 5 as u8) {
79+
// (0, _) => (),
80+
// (1.., _) => ()
81+
// }
7782
// }
7883

7984
// FIXME: support half_open_range_patterns (`..=2`),
@@ -85,7 +90,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
8590

8691
// `0 .. =>` or `let 0 .. =` or `Some(0 .. )`
8792
// ^ ^ ^
88-
if p.at(T![=]) | p.at(T![')']) {
93+
if p.at(T![=]) | p.at(T![')']) | p.at(T![,]) {
8994
// test half_open_range_pat
9095
// fn f() { let 0 .. = 1u32; }
9196
} else {

‎crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast

Lines changed: 157 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
SOURCE_FILE@0..223
2-
FN@0..222
1+
SOURCE_FILE@0..307
2+
FN@0..306
33
[email protected] "fn"
44
[email protected] " "
55
[email protected]
@@ -8,8 +8,8 @@ [email protected]
88
[email protected] "("
99
[email protected] ")"
1010
[email protected] " "
11-
BLOCK_EXPR@10..222
12-
STMT_LIST@10..222
11+
BLOCK_EXPR@10..306
12+
STMT_LIST@10..306
1313
[email protected] "{"
1414
[email protected] "\n "
1515
[email protected]
@@ -96,80 +96,156 @@ [email protected]
9696
[email protected] "\n "
9797
[email protected] "}"
9898
[email protected] "\n\n "
99-
[email protected]
100-
[email protected] "match"
101-
[email protected] " "
102-
[email protected]
103-
[email protected]
104-
[email protected]
105-
[email protected]
106-
[email protected]
107-
[email protected] "Some"
108-
[email protected]
109-
[email protected] "("
110-
[email protected]
111-
[email protected]
112-
[email protected] "10"
113-
[email protected] " "
114-
[email protected] "as"
115-
[email protected] " "
116-
[email protected]
117-
[email protected]
118-
[email protected]
119-
[email protected]
120-
[email protected] "u8"
121-
[email protected] ")"
122-
[email protected] " "
123-
[email protected]
124-
[email protected] "{"
125-
[email protected] "\n "
126-
[email protected]
127-
[email protected]
128-
[email protected]
129-
[email protected]
130-
[email protected]
131-
[email protected]
132-
[email protected] "Some"
133-
[email protected] "("
134-
[email protected]
135-
[email protected]
136-
[email protected] "0"
137-
[email protected] ")"
138-
[email protected] " "
139-
[email protected] "|"
140-
[email protected] " "
141-
[email protected]
142-
[email protected]
143-
[email protected] "None"
144-
[email protected] " "
145-
[email protected] "=>"
146-
[email protected] " "
147-
[email protected]
148-
[email protected] "("
149-
[email protected] ")"
150-
[email protected] ","
151-
[email protected] "\n "
152-
[email protected]
153-
[email protected]
154-
[email protected]
155-
[email protected]
156-
[email protected]
157-
[email protected] "Some"
158-
[email protected] "("
159-
[email protected]
160-
[email protected]
161-
[email protected]
162-
[email protected] "1"
163-
[email protected] ".."
164-
[email protected] ")"
165-
[email protected] " "
166-
[email protected] "=>"
167-
[email protected] " "
168-
[email protected]
169-
[email protected] "("
170-
[email protected] ")"
171-
[email protected] "\n "
172-
[email protected] "}"
173-
[email protected] "\n"
174-
[email protected] "}"
175-
[email protected] "\n"
99+
[email protected]
100+
[email protected]
101+
[email protected] "match"
102+
[email protected] " "
103+
[email protected]
104+
[email protected]
105+
[email protected]
106+
[email protected]
107+
[email protected]
108+
[email protected] "Some"
109+
[email protected]
110+
[email protected] "("
111+
[email protected]
112+
[email protected]
113+
[email protected] "10"
114+
[email protected] " "
115+
[email protected] "as"
116+
[email protected] " "
117+
[email protected]
118+
[email protected]
119+
[email protected]
120+
[email protected]
121+
[email protected] "u8"
122+
[email protected] ")"
123+
[email protected] " "
124+
[email protected]
125+
[email protected] "{"
126+
[email protected] "\n "
127+
[email protected]
128+
[email protected]
129+
[email protected]
130+
[email protected]
131+
[email protected]
132+
[email protected]
133+
[email protected] "Some"
134+
[email protected] "("
135+
[email protected]
136+
[email protected]
137+
[email protected] "0"
138+
[email protected] ")"
139+
[email protected] " "
140+
[email protected] "|"
141+
[email protected] " "
142+
[email protected]
143+
[email protected]
144+
[email protected] "None"
145+
[email protected] " "
146+
[email protected] "=>"
147+
[email protected] " "
148+
[email protected]
149+
[email protected] "("
150+
[email protected] ")"
151+
[email protected] ","
152+
[email protected] "\n "
153+
[email protected]
154+
[email protected]
155+
[email protected]
156+
[email protected]
157+
[email protected]
158+
[email protected] "Some"
159+
[email protected] "("
160+
[email protected]
161+
[email protected]
162+
[email protected]
163+
[email protected] "1"
164+
[email protected] ".."
165+
[email protected] ")"
166+
[email protected] " "
167+
[email protected] "=>"
168+
[email protected] " "
169+
[email protected]
170+
[email protected] "("
171+
[email protected] ")"
172+
[email protected] "\n "
173+
[email protected] "}"
174+
[email protected] "\n\n "
175+
[email protected]
176+
[email protected] "match"
177+
[email protected] " "
178+
[email protected]
179+
[email protected] "("
180+
[email protected]
181+
[email protected]
182+
[email protected] "10"
183+
[email protected] " "
184+
[email protected] "as"
185+
[email protected] " "
186+
[email protected]
187+
[email protected]
188+
[email protected]
189+
[email protected]
190+
[email protected] "u8"
191+
[email protected] ","
192+
[email protected] " "
193+
[email protected]
194+
[email protected]
195+
[email protected] "5"
196+
[email protected] " "
197+
[email protected] "as"
198+
[email protected] " "
199+
[email protected]
200+
[email protected]
201+
[email protected]
202+
[email protected]
203+
[email protected] "u8"
204+
[email protected] ")"
205+
[email protected] " "
206+
[email protected]
207+
[email protected] "{"
208+
[email protected] "\n "
209+
[email protected]
210+
[email protected]
211+
[email protected] "("
212+
[email protected]
213+
[email protected]
214+
[email protected] "0"
215+
[email protected] ","
216+
[email protected] " "
217+
[email protected]
218+
[email protected] "_"
219+
[email protected] ")"
220+
[email protected] " "
221+
[email protected] "=>"
222+
[email protected] " "
223+
[email protected]
224+
[email protected] "("
225+
[email protected] ")"
226+
[email protected] ","
227+
[email protected] "\n "
228+
[email protected]
229+
[email protected]
230+
[email protected] "("
231+
[email protected]
232+
[email protected]
233+
[email protected]
234+
[email protected] "1"
235+
[email protected] ".."
236+
[email protected] ","
237+
[email protected] " "
238+
[email protected]
239+
[email protected] "_"
240+
[email protected] ")"
241+
[email protected] " "
242+
[email protected] "=>"
243+
[email protected] " "
244+
[email protected]
245+
[email protected] "("
246+
[email protected] ")"
247+
[email protected] "\n "
248+
[email protected] "}"
249+
[email protected] "\n"
250+
[email protected] "}"
251+
[email protected] "\n"

‎crates/syntax/test_data/parser/inline/ok/0058_range_pat.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@ fn main() {
1010
Some(0) | None => (),
1111
Some(1..) => ()
1212
}
13+
14+
match (10 as u8, 5 as u8) {
15+
(0, _) => (),
16+
(1.., _) => ()
17+
}
1318
}

0 commit comments

Comments
 (0)