Skip to content

Commit 21d5d13

Browse files
committed
Add tests for the parsing of + and the error messages if people get it wrong.
Fixes #18772.
1 parent 1479a90 commit 21d5d13

File tree

3 files changed

+83
-0
lines changed

3 files changed

+83
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(unboxed_closures)]
12+
13+
// Test that we suggest the correct parentheses
14+
15+
trait Bar {
16+
fn dummy(&self) { }
17+
}
18+
19+
struct Foo<'a> {
20+
a: &'a Bar+'a,
21+
//~^ ERROR E0171
22+
//~^^ NOTE perhaps you meant `&'a (Bar + 'a)`?
23+
24+
b: &'a mut Bar+'a,
25+
//~^ ERROR E0171
26+
//~^^ NOTE perhaps you meant `&'a mut (Bar + 'a)`?
27+
28+
c: Box<Bar+'a>, // OK, no paren needed in this context
29+
30+
d: fn() -> Bar+'a,
31+
//~^ ERROR E0171
32+
//~^^ NOTE perhaps you forgot parentheses
33+
}
34+
35+
fn main() { }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(unboxed_closures)]
12+
13+
// Test that `F : Fn(int) -> int + Send` is interpreted as two
14+
// distinct bounds on `F`.
15+
16+
fn foo<F>(f: F)
17+
where F : FnOnce(int) -> int + Send
18+
{
19+
bar(f);
20+
baz(f);
21+
}
22+
23+
fn bar<F:Send>(f: F) { }
24+
25+
fn baz<F:FnOnce(int) -> int>(f: F) { }
26+
27+
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(unboxed_closures)]
12+
13+
// Test that `Fn(int) -> int + 'static` parses as `(Fn(int) -> int) +
14+
// 'static` and not `Fn(int) -> (int + 'static)`. The latter would
15+
// cause a compilation error. Issue #18772.
16+
17+
fn adder(y: int) -> Box<Fn(int) -> int + 'static> {
18+
box move |&: x| y + x
19+
}
20+
21+
fn main() {}

0 commit comments

Comments
 (0)