Skip to content

Commit 36353bb

Browse files
bors[bot]matthewjasper
bors[bot]
and
matthewjasper
authored
Merge #4833
4833: Separating parsing of `for` in predicates and types r=matklad a=matthewjasper We now correctly accept `for<'a> (&'a F): Fn(&'a str)` in a where clause and correctly reject `for<'a> &'a u32` as a type. Co-authored-by: Matthew Jasper <[email protected]>
2 parents bd61ad7 + 8622e4c commit 36353bb

File tree

14 files changed

+843
-291
lines changed

14 files changed

+843
-291
lines changed

‎crates/ra_parser/src/grammar/type_params.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,14 @@ fn where_predicate(p: &mut Parser) {
191191
}
192192
_ => {
193193
// test where_pred_for
194-
// fn test<F>()
194+
// fn for_trait<F>()
195195
// where
196196
// for<'a> F: Fn(&'a str)
197197
// { }
198+
if p.at(T![for]) {
199+
types::for_binder(p);
200+
}
201+
198202
types::type_(p);
199203

200204
if p.at(T![:]) {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,19 +216,21 @@ pub(super) fn for_binder(p: &mut Parser) {
216216

217217
// test for_type
218218
// type A = for<'a> fn() -> ();
219-
// fn foo<T>(_t: &T) where for<'a> &'a T: Iterator {}
220-
// fn bar<T>(_t: &T) where for<'a> &'a mut T: Iterator {}
221-
// fn baz<T>(_t: &T) where for<'a> <&'a T as Baz>::Foo: Iterator {}
219+
// type B = for<'a> unsafe extern "C" fn(&'a ()) -> ();
220+
// type Obj = for<'a> PartialEq<&'a i32>;
222221
pub(super) fn for_type(p: &mut Parser) {
223222
assert!(p.at(T![for]));
224223
let m = p.start();
225224
for_binder(p);
226225
match p.current() {
227-
T![fn] | T![unsafe] | T![extern] => fn_pointer_type(p),
228-
T![&] => reference_type(p),
229-
_ if paths::is_path_start(p) => path_type_(p, false),
230-
_ => p.error("expected a path"),
226+
T![fn] | T![unsafe] | T![extern] => {}
227+
// OK: legacy trait object format
228+
_ if paths::is_use_path_start(p) => {}
229+
_ => {
230+
p.error("expected a function pointer or path");
231+
}
231232
}
233+
type_no_bounds(p);
232234
m.complete(p, FOR_TYPE);
233235
}
234236

‎crates/ra_syntax/src/ast.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ where
285285
let pred = predicates.next().unwrap();
286286
let mut bounds = pred.type_bound_list().unwrap().bounds();
287287

288+
assert!(pred.for_token().is_none());
289+
assert!(pred.type_param_list().is_none());
288290
assert_eq!("T", pred.type_ref().unwrap().syntax().text().to_string());
289291
assert_bound("Clone", bounds.next());
290292
assert_bound("Copy", bounds.next());
@@ -322,6 +324,8 @@ where
322324
let pred = predicates.next().unwrap();
323325
let mut bounds = pred.type_bound_list().unwrap().bounds();
324326

325-
assert_eq!("for<'a> F", pred.type_ref().unwrap().syntax().text().to_string());
327+
assert!(pred.for_token().is_some());
328+
assert_eq!("<'a>", pred.type_param_list().unwrap().syntax().text().to_string());
329+
assert_eq!("F", pred.type_ref().unwrap().syntax().text().to_string());
326330
assert_bound("Fn(&'a str)", bounds.next());
327331
}

‎crates/ra_syntax/src/ast/generated/nodes.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,6 +2052,8 @@ pub struct WherePred {
20522052
}
20532053
impl ast::TypeBoundsOwner for WherePred {}
20542054
impl WherePred {
2055+
pub fn for_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![for]) }
2056+
pub fn type_param_list(&self) -> Option<TypeParamList> { support::child(&self.syntax) }
20552057
pub fn lifetime_token(&self) -> Option<SyntaxToken> {
20562058
support::token(&self.syntax, T![lifetime])
20572059
}

‎crates/ra_syntax/test_data/parser/err/0027_incomplere_where_for.rast‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ [email protected]
1212
[email protected] "where"
1313
[email protected] " "
1414
[email protected]
15-
[email protected]
16-
[email protected] "for"
17-
[email protected]
18-
[email protected] "<"
19-
[email protected]
20-
[email protected] "\'a"
21-
[email protected] ">"
15+
[email protected] "for"
16+
[email protected]
17+
[email protected] "<"
18+
[email protected]
19+
[email protected] "\'a"
20+
[email protected] ">"
2221
[email protected] "\n"
2322
[email protected]
2423
[email protected] "{"
2524
[email protected] "}"
2625
[email protected] "\n"
27-
error 26..26: expected a path
26+
error 26..26: expected type
2827
error 26..26: expected colon

‎crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rast‎

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
[email protected]
2+
[email protected]
3+
[email protected] "type"
4+
[email protected] " "
5+
[email protected]
6+
[email protected] "ForRef"
7+
[email protected] " "
8+
[email protected] "="
9+
[email protected] " "
10+
[email protected]
11+
[email protected] "for"
12+
[email protected]
13+
[email protected] "<"
14+
[email protected]
15+
[email protected] "\'a"
16+
[email protected] ">"
17+
[email protected] " "
18+
[email protected]
19+
[email protected] "&"
20+
[email protected] "\'a"
21+
[email protected] " "
22+
[email protected]
23+
[email protected]
24+
[email protected]
25+
[email protected]
26+
[email protected] "u32"
27+
[email protected] ";"
28+
[email protected] "\n"
29+
[email protected]
30+
[email protected] "type"
31+
[email protected] " "
32+
[email protected]
33+
[email protected] "ForTup"
34+
[email protected] " "
35+
[email protected] "="
36+
[email protected] " "
37+
[email protected]
38+
[email protected] "for"
39+
[email protected]
40+
[email protected] "<"
41+
[email protected]
42+
[email protected] "\'a"
43+
[email protected] ">"
44+
[email protected] " "
45+
[email protected]
46+
[email protected] "("
47+
[email protected]
48+
[email protected] "&"
49+
[email protected] "\'a"
50+
[email protected] " "
51+
[email protected]
52+
[email protected]
53+
[email protected]
54+
[email protected]
55+
[email protected] "u32"
56+
[email protected] ","
57+
[email protected] ")"
58+
[email protected] ";"
59+
[email protected] "\n"
60+
[email protected]
61+
[email protected] "type"
62+
[email protected] " "
63+
[email protected]
64+
[email protected] "ForSlice"
65+
[email protected] " "
66+
[email protected] "="
67+
[email protected] " "
68+
[email protected]
69+
[email protected] "for"
70+
[email protected]
71+
[email protected] "<"
72+
[email protected]
73+
[email protected] "\'a"
74+
[email protected] ">"
75+
[email protected] " "
76+
[email protected]
77+
[email protected] "["
78+
[email protected]
79+
[email protected]
80+
[email protected]
81+
[email protected]
82+
[email protected] "u32"
83+
[email protected] "]"
84+
[email protected] ";"
85+
[email protected] "\n"
86+
[email protected]
87+
[email protected] "type"
88+
[email protected] " "
89+
[email protected]
90+
[email protected] "ForForFn"
91+
[email protected] " "
92+
[email protected] "="
93+
[email protected] " "
94+
[email protected]
95+
[email protected] "for"
96+
[email protected]
97+
[email protected] "<"
98+
[email protected]
99+
[email protected] "\'a"
100+
[email protected] ">"
101+
[email protected] " "
102+
[email protected]
103+
[email protected] "for"
104+
[email protected]
105+
[email protected] "<"
106+
[email protected]
107+
[email protected] "\'b"
108+
[email protected] ">"
109+
[email protected] " "
110+
[email protected]
111+
[email protected] "fn"
112+
[email protected]
113+
[email protected] "("
114+
[email protected]
115+
[email protected]
116+
[email protected] "&"
117+
[email protected] "\'a"
118+
[email protected] " "
119+
[email protected]
120+
[email protected]
121+
[email protected]
122+
[email protected]
123+
[email protected] "i32"
124+
[email protected] ","
125+
[email protected] " "
126+
[email protected]
127+
[email protected]
128+
[email protected] "&"
129+
[email protected] "\'b"
130+
[email protected] " "
131+
[email protected]
132+
[email protected]
133+
[email protected]
134+
[email protected]
135+
[email protected] "i32"
136+
[email protected] ")"
137+
[email protected] ";"
138+
[email protected] "\n"
139+
[email protected]
140+
[email protected] "fn"
141+
[email protected] " "
142+
[email protected]
143+
[email protected] "for_for_for"
144+
[email protected]
145+
[email protected] "<"
146+
[email protected]
147+
[email protected]
148+
[email protected] "T"
149+
[email protected] ">"
150+
[email protected]
151+
[email protected] "("
152+
[email protected] ")"
153+
[email protected] "\n"
154+
[email protected]
155+
[email protected] "where"
156+
[email protected] "\n "
157+
[email protected]
158+
[email protected] "for"
159+
[email protected]
160+
[email protected] "<"
161+
[email protected]
162+
[email protected] "\'a"
163+
[email protected] ">"
164+
[email protected] " "
165+
[email protected]
166+
[email protected] "for"
167+
[email protected]
168+
[email protected] "<"
169+
[email protected]
170+
[email protected] "\'b"
171+
[email protected] ">"
172+
[email protected] " "
173+
[email protected]
174+
[email protected] "for"
175+
[email protected]
176+
[email protected] "<"
177+
[email protected]
178+
[email protected] "\'c"
179+
[email protected] ">"
180+
[email protected] " "
181+
[email protected]
182+
[email protected] "fn"
183+
[email protected]
184+
[email protected] "("
185+
[email protected]
186+
[email protected]
187+
[email protected] "&"
188+
[email protected] "\'a"
189+
[email protected] " "
190+
[email protected]
191+
[email protected]
192+
[email protected]
193+
[email protected]
194+
[email protected] "T"
195+
[email protected] ","
196+
[email protected] " "
197+
[email protected]
198+
[email protected]
199+
[email protected] "&"
200+
[email protected] "\'b"
201+
[email protected] " "
202+
[email protected]
203+
[email protected]
204+
[email protected]
205+
[email protected]
206+
[email protected] "T"
207+
[email protected] ","
208+
[email protected] " "
209+
[email protected]
210+
[email protected]
211+
[email protected] "&"
212+
[email protected] "\'c"
213+
[email protected] " "
214+
[email protected]
215+
[email protected]
216+
[email protected]
217+
[email protected]
218+
[email protected] "T"
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]
228+
[email protected] "Copy"
229+
[email protected] ","
230+
[email protected] "\n"
231+
[email protected]
232+
[email protected] "{"
233+
[email protected] "\n"
234+
[email protected] "}"
235+
[email protected] "\n"
236+
error 21..21: expected a function pointer or path
237+
error 52..52: expected a function pointer or path
238+
error 88..88: expected a function pointer or path
239+
error 119..119: expected a function pointer or path
240+
error 195..195: expected a function pointer or path

‎crates/ra_syntax/test_data/parser/err/0044_unexpected_for_type.rs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
type ForRef = for<'a> &'a u32;
2+
type ForTup = for<'a> (&'a u32,);
3+
type ForSlice = for<'a> [u32];
4+
type ForForFn = for<'a> for<'b> fn(&'a i32, &'b i32);
5+
fn for_for_for<T>()
6+
where
7+
for<'a> for<'b> for<'c> fn(&'a T, &'b T, &'c T): Copy,
8+
{
9+
}

0 commit comments

Comments
 (0)