Skip to content

Commit 0e05f04

Browse files
committed
Use output from stable rust and ignore the ui tests on nightly
1 parent 2ab2a03 commit 0e05f04

6 files changed

+14
-12
lines changed

crates/bevy_ecs/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ serde = "1"
3030
parking_lot = "0.11"
3131
rand = "0.8"
3232
trybuild = "1.0"
33+
rustversion = "1.0"
3334

3435
[[example]]
3536
name = "events"

crates/bevy_ecs/tests/ui.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#[rustversion::attr(nightly, ignore)]
12
#[test]
23
fn test() {
34
let t = trybuild::TestCases::new();

crates/bevy_ecs/tests/ui/system_query_get_lifetime_safety.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ error[E0499]: cannot borrow `query` as mutable more than once at a time
22
--> tests/ui/system_query_get_lifetime_safety.rs:8:14
33
|
44
7 | let a1 = query.get_mut(*e).unwrap();
5-
| ----------------- first mutable borrow occurs here
5+
| ----- first mutable borrow occurs here
66
8 | let a2 = query.get_mut(*e).unwrap();
7-
| ^^^^^^^^^^^^^^^^^ second mutable borrow occurs here
7+
| ^^^^^ second mutable borrow occurs here
88
9 | // this should fail to compile
99
10 | println!("{} {}", a1.0, a2.0);
1010
| -- first borrow later used here

crates/bevy_ecs/tests/ui/system_query_iter_lifetime_safety.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ error[E0499]: cannot borrow `query` as mutable more than once at a time
22
--> tests/ui/system_query_iter_lifetime_safety.rs:10:21
33
|
44
7 | let mut iter = query.iter_mut();
5-
| ---------------- first mutable borrow occurs here
5+
| ----- first mutable borrow occurs here
66
...
77
10 | let mut iter2 = query.iter_mut();
8-
| ^^^^^^^^^^^^^^^^ second mutable borrow occurs here
8+
| ^^^^^ second mutable borrow occurs here
99
...
1010
14 | println!("{}", a.0);
1111
| --- first borrow later used here

crates/bevy_ecs/tests/ui/system_query_set_get_lifetime_safety.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ error[E0499]: cannot borrow `queries` as mutable more than once at a time
22
--> tests/ui/system_query_set_get_lifetime_safety.rs:10:14
33
|
44
7 | let mut q2 = queries.q0();
5-
| ------------ first mutable borrow occurs here
5+
| ------- first mutable borrow occurs here
66
...
77
10 | let q1 = queries.q1();
8-
| ^^^^^^^^^^^^ second mutable borrow occurs here
8+
| ^^^^^^^ second mutable borrow occurs here
99
...
1010
14 | b.0 = a.0
1111
| - first borrow later used here
@@ -14,10 +14,10 @@ error[E0499]: cannot borrow `queries` as mutable more than once at a time
1414
--> tests/ui/system_query_set_get_lifetime_safety.rs:21:18
1515
|
1616
18 | let q1 = queries.q1();
17-
| ------------ first mutable borrow occurs here
17+
| ------- first mutable borrow occurs here
1818
...
1919
21 | let mut q2 = queries.q0();
20-
| ^^^^^^^^^^^^ second mutable borrow occurs here
20+
| ^^^^^^^ second mutable borrow occurs here
2121
...
2222
25 | b.0 = a.0
2323
| --- first borrow later used here

crates/bevy_ecs/tests/ui/system_query_set_iter_lifetime_safety.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ error[E0499]: cannot borrow `queries` as mutable more than once at a time
22
--> tests/ui/system_query_set_iter_lifetime_safety.rs:11:14
33
|
44
7 | let mut q2 = queries.q0();
5-
| ------------ first mutable borrow occurs here
5+
| ------- first mutable borrow occurs here
66
...
77
11 | let q1 = queries.q1();
8-
| ^^^^^^^^^^^^ second mutable borrow occurs here
8+
| ^^^^^^^ second mutable borrow occurs here
99
...
1010
16 | b.0 = a.0
1111
| - first borrow later used here
@@ -14,10 +14,10 @@ error[E0499]: cannot borrow `queries` as mutable more than once at a time
1414
--> tests/ui/system_query_set_iter_lifetime_safety.rs:24:18
1515
|
1616
20 | let q1 = queries.q1();
17-
| ------------ first mutable borrow occurs here
17+
| ------- first mutable borrow occurs here
1818
...
1919
24 | let mut q2 = queries.q0();
20-
| ^^^^^^^^^^^^ second mutable borrow occurs here
20+
| ^^^^^^^ second mutable borrow occurs here
2121
...
2222
29 | b.0 = a.0;
2323
| --- first borrow later used here

0 commit comments

Comments
 (0)