Skip to content

Commit e1f6305

Browse files
committed
Auto merge of rust-lang#10704 - matthiaskrgr:splitest, r=llogiq
split test into 2 changelog: none
2 parents 496c110 + 572eecd commit e1f6305

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

tests/ui/crashes/ice-10645.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// compile-flags: --cap-lints=warn
2+
// https://github.com/rust-lang/rust-clippy/issues/10645
3+
4+
#![warn(clippy::future_not_send)]
5+
pub async fn bar<'a, T: 'a>(_: T) {}
6+
7+
fn main() {}

tests/ui/crashes/ice-5207.stderr renamed to tests/ui/crashes/ice-10645.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: future cannot be sent between threads safely
2-
--> $DIR/ice-5207.rs:6:35
2+
--> $DIR/ice-10645.rs:5:35
33
|
44
LL | pub async fn bar<'a, T: 'a>(_: T) {}
55
| ^ future returned by `bar` is not `Send`
66
|
77
note: captured value is not `Send`
8-
--> $DIR/ice-5207.rs:6:29
8+
--> $DIR/ice-10645.rs:5:29
99
|
1010
LL | pub async fn bar<'a, T: 'a>(_: T) {}
1111
| ^ has type `T` which is not `Send`

tests/ui/crashes/ice-5207.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// compile-flags: --cap-lints=warn
2-
// ^ for https://github.com/rust-lang/rust-clippy/issues/10645
3-
41
// Regression test for https://github.com/rust-lang/rust-clippy/issues/5207
5-
#![warn(clippy::future_not_send)]
62
pub async fn bar<'a, T: 'a>(_: T) {}
73

84
fn main() {}

0 commit comments

Comments
 (0)