Skip to content

Commit 6ee3515

Browse files
bors[bot]xffxff
bors[bot]
and
xffxff
authored
Merge #10449
10449: make Some(1..) parsed r=lnicola a=XFFXFF fixes #9066 [rustc_ty_utils/src/ty.rs](https://github.com/rust-lang/rust/blob/d7795d302adbb8c1547c952cd0d04a7f9ca29262/compiler/rustc_ty_utils/src/ty.rs#L524) Co-authored-by: zhoufan <[email protected]>
2 parents 4b7675f + a248f39 commit 6ee3515

File tree

3 files changed

+178
-92
lines changed

3 files changed

+178
-92
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
6969
// 200 .. 301 => (),
7070
// 302 .. => (),
7171
// }
72+
//
73+
// match Some(10 as u8) {
74+
// Some(0) | None => (),
75+
// Some(1..) => ()
76+
// }
7277
// }
7378

7479
// FIXME: support half_open_range_patterns (`..=2`),
@@ -78,9 +83,9 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
7883
let m = lhs.precede(p);
7984
p.bump(range_op);
8085

81-
// `0 .. =>` or `let 0 .. =`
82-
// ^ ^
83-
if p.at(T![=]) {
86+
// `0 .. =>` or `let 0 .. =` or `Some(0 .. )`
87+
// ^ ^ ^
88+
if p.at(T![=]) | p.at(T![')']) {
8489
// test half_open_range_pat
8590
// fn f() { let 0 .. = 1u32; }
8691
} else {

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

Lines changed: 165 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
SOURCE_FILE@0..135
2-
FN@0..134
1+
SOURCE_FILE@0..223
2+
FN@0..222
33
[email protected] "fn"
44
[email protected] " "
55
[email protected]
@@ -8,92 +8,168 @@ [email protected]
88
[email protected] "("
99
[email protected] ")"
1010
[email protected] " "
11-
BLOCK_EXPR@10..134
12-
STMT_LIST@10..134
11+
BLOCK_EXPR@10..222
12+
STMT_LIST@10..222
1313
[email protected] "{"
1414
[email protected] "\n "
15-
[email protected]
16-
[email protected] "match"
17-
[email protected] " "
18-
[email protected]
19-
[email protected] "92"
20-
[email protected] " "
21-
[email protected]
22-
[email protected] "{"
23-
[email protected] "\n "
24-
[email protected]
25-
[email protected]
26-
[email protected]
27-
[email protected]
28-
[email protected] "0"
29-
[email protected] " "
30-
[email protected] "..."
31-
[email protected] " "
32-
[email protected]
33-
[email protected]
34-
[email protected] "100"
35-
[email protected] " "
36-
[email protected] "=>"
37-
[email protected] " "
38-
[email protected]
39-
[email protected] "("
40-
[email protected] ")"
41-
[email protected] ","
42-
[email protected] "\n "
43-
[email protected]
44-
[email protected]
45-
[email protected]
46-
[email protected]
47-
[email protected] "101"
48-
[email protected] " "
49-
[email protected] "..="
50-
[email protected] " "
51-
[email protected]
52-
[email protected]
53-
[email protected] "200"
54-
[email protected] " "
55-
[email protected] "=>"
56-
[email protected] " "
57-
[email protected]
58-
[email protected] "("
59-
[email protected] ")"
60-
[email protected] ","
61-
[email protected] "\n "
62-
[email protected]
63-
[email protected]
64-
[email protected]
65-
[email protected]
66-
[email protected] "200"
67-
[email protected] " "
68-
[email protected] ".."
69-
[email protected] " "
70-
[email protected]
71-
[email protected]
72-
[email protected] "301"
73-
[email protected] " "
74-
[email protected] "=>"
75-
[email protected] " "
76-
[email protected]
77-
[email protected] "("
78-
[email protected] ")"
79-
[email protected] ","
80-
[email protected] "\n "
81-
[email protected]
82-
[email protected]
83-
[email protected]
84-
[email protected]
85-
[email protected] "302"
86-
[email protected] " "
87-
[email protected] ".."
88-
[email protected] " "
89-
[email protected] "=>"
90-
[email protected] " "
91-
[email protected]
92-
[email protected] "("
93-
[email protected] ")"
94-
[email protected] ","
95-
[email protected] "\n "
96-
[email protected] "}"
97-
[email protected] "\n"
98-
[email protected] "}"
99-
[email protected] "\n"
15+
[email protected]
16+
[email protected]
17+
[email protected] "match"
18+
[email protected] " "
19+
[email protected]
20+
[email protected] "92"
21+
[email protected] " "
22+
[email protected]
23+
[email protected] "{"
24+
[email protected] "\n "
25+
[email protected]
26+
[email protected]
27+
[email protected]
28+
[email protected]
29+
[email protected] "0"
30+
[email protected] " "
31+
[email protected] "..."
32+
[email protected] " "
33+
[email protected]
34+
[email protected]
35+
[email protected] "100"
36+
[email protected] " "
37+
[email protected] "=>"
38+
[email protected] " "
39+
[email protected]
40+
[email protected] "("
41+
[email protected] ")"
42+
[email protected] ","
43+
[email protected] "\n "
44+
[email protected]
45+
[email protected]
46+
[email protected]
47+
[email protected]
48+
[email protected] "101"
49+
[email protected] " "
50+
[email protected] "..="
51+
[email protected] " "
52+
[email protected]
53+
[email protected]
54+
[email protected] "200"
55+
[email protected] " "
56+
[email protected] "=>"
57+
[email protected] " "
58+
[email protected]
59+
[email protected] "("
60+
[email protected] ")"
61+
[email protected] ","
62+
[email protected] "\n "
63+
[email protected]
64+
[email protected]
65+
[email protected]
66+
[email protected]
67+
[email protected] "200"
68+
[email protected] " "
69+
[email protected] ".."
70+
[email protected] " "
71+
[email protected]
72+
[email protected]
73+
[email protected] "301"
74+
[email protected] " "
75+
[email protected] "=>"
76+
[email protected] " "
77+
[email protected]
78+
[email protected] "("
79+
[email protected] ")"
80+
[email protected] ","
81+
[email protected] "\n "
82+
[email protected]
83+
[email protected]
84+
[email protected]
85+
[email protected]
86+
[email protected] "302"
87+
[email protected] " "
88+
[email protected] ".."
89+
[email protected] " "
90+
[email protected] "=>"
91+
[email protected] " "
92+
[email protected]
93+
[email protected] "("
94+
[email protected] ")"
95+
[email protected] ","
96+
[email protected] "\n "
97+
[email protected] "}"
98+
[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"

‎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
@@ -5,4 +5,9 @@ fn main() {
55
200 .. 301 => (),
66
302 .. => (),
77
}
8+
9+
match Some(10 as u8) {
10+
Some(0) | None => (),
11+
Some(1..) => ()
12+
}
813
}

0 commit comments

Comments
 (0)