Skip to content

Commit 2bf9286

Browse files
authored
Merge pull request #336 from japaric/fix-ci2
Fix CI
2 parents 62b122e + b469290 commit 2bf9286

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

cfail/ui/freeze.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0499]: cannot borrow `q` as mutable more than once at a time
2-
--> ui/freeze.rs:7:5
2+
--> $DIR/freeze.rs:7:5
33
|
44
6 | let (_p, mut _c) = q.split();
55
| --------- first mutable borrow occurs here

cfail/ui/not-send.stderr

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error[E0277]: `*const ()` cannot be sent between threads safely
2-
--> ui/not-send.rs:19:5
2+
--> $DIR/not-send.rs:19:15
33
|
44
19 | is_send::<Consumer<NotSend, 4>>();
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
5+
| ^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
66
|
77
= help: within `PhantomData<*const ()>`, the trait `Send` is not implemented for `*const ()`
88
= note: required because it appears within the type `PhantomData<*const ()>`
9-
= note: required because of the requirements on the impl of `Send` for `Consumer<'_, PhantomData<*const ()>, 4>`
9+
= note: required for `Consumer<'_, PhantomData<*const ()>, 4>` to implement `Send`
1010
note: required by a bound in `is_send`
11-
--> ui/not-send.rs:14:8
11+
--> $DIR/not-send.rs:14:8
1212
|
1313
12 | fn is_send<T>()
1414
| ------- required by a bound in this
@@ -17,16 +17,16 @@ note: required by a bound in `is_send`
1717
| ^^^^ required by this bound in `is_send`
1818

1919
error[E0277]: `*const ()` cannot be sent between threads safely
20-
--> ui/not-send.rs:20:5
20+
--> $DIR/not-send.rs:20:15
2121
|
2222
20 | is_send::<Producer<NotSend, 4>>();
23-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
23+
| ^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
2424
|
2525
= help: within `PhantomData<*const ()>`, the trait `Send` is not implemented for `*const ()`
2626
= note: required because it appears within the type `PhantomData<*const ()>`
27-
= note: required because of the requirements on the impl of `Send` for `Producer<'_, PhantomData<*const ()>, 4>`
27+
= note: required for `Producer<'_, PhantomData<*const ()>, 4>` to implement `Send`
2828
note: required by a bound in `is_send`
29-
--> ui/not-send.rs:14:8
29+
--> $DIR/not-send.rs:14:8
3030
|
3131
12 | fn is_send<T>()
3232
| ------- required by a bound in this
@@ -35,10 +35,10 @@ note: required by a bound in `is_send`
3535
| ^^^^ required by this bound in `is_send`
3636

3737
error[E0277]: `*const ()` cannot be sent between threads safely
38-
--> ui/not-send.rs:21:5
38+
--> $DIR/not-send.rs:21:15
3939
|
4040
21 | is_send::<Queue<NotSend, 4>>();
41-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
41+
| ^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
4242
|
4343
= help: within `Queue<PhantomData<*const ()>, 4>`, the trait `Send` is not implemented for `*const ()`
4444
= note: required because it appears within the type `PhantomData<*const ()>`
@@ -48,7 +48,7 @@ error[E0277]: `*const ()` cannot be sent between threads safely
4848
= note: required because it appears within the type `[UnsafeCell<MaybeUninit<PhantomData<*const ()>>>; 4]`
4949
= note: required because it appears within the type `Queue<PhantomData<*const ()>, 4>`
5050
note: required by a bound in `is_send`
51-
--> ui/not-send.rs:14:8
51+
--> $DIR/not-send.rs:14:8
5252
|
5353
12 | fn is_send<T>()
5454
| ------- required by a bound in this
@@ -57,10 +57,10 @@ note: required by a bound in `is_send`
5757
| ^^^^ required by this bound in `is_send`
5858

5959
error[E0277]: `*const ()` cannot be sent between threads safely
60-
--> ui/not-send.rs:22:5
60+
--> $DIR/not-send.rs:22:15
6161
|
6262
22 | is_send::<Vec<NotSend, 4>>();
63-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
63+
| ^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
6464
|
6565
= help: within `heapless::Vec<PhantomData<*const ()>, 4>`, the trait `Send` is not implemented for `*const ()`
6666
= note: required because it appears within the type `PhantomData<*const ()>`
@@ -69,7 +69,7 @@ error[E0277]: `*const ()` cannot be sent between threads safely
6969
= note: required because it appears within the type `[MaybeUninit<PhantomData<*const ()>>; 4]`
7070
= note: required because it appears within the type `heapless::Vec<PhantomData<*const ()>, 4>`
7171
note: required by a bound in `is_send`
72-
--> ui/not-send.rs:14:8
72+
--> $DIR/not-send.rs:14:8
7373
|
7474
12 | fn is_send<T>()
7575
| ------- required by a bound in this
@@ -78,10 +78,10 @@ note: required by a bound in `is_send`
7878
| ^^^^ required by this bound in `is_send`
7979

8080
error[E0277]: `*const ()` cannot be sent between threads safely
81-
--> ui/not-send.rs:23:5
81+
--> $DIR/not-send.rs:23:15
8282
|
8383
23 | is_send::<HistoryBuffer<NotSend, 4>>();
84-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
84+
| ^^^^^^^^^^^^^^^^^^^^^^^^^ `*const ()` cannot be sent between threads safely
8585
|
8686
= help: within `HistoryBuffer<PhantomData<*const ()>, 4>`, the trait `Send` is not implemented for `*const ()`
8787
= note: required because it appears within the type `PhantomData<*const ()>`
@@ -90,7 +90,7 @@ error[E0277]: `*const ()` cannot be sent between threads safely
9090
= note: required because it appears within the type `[MaybeUninit<PhantomData<*const ()>>; 4]`
9191
= note: required because it appears within the type `HistoryBuffer<PhantomData<*const ()>, 4>`
9292
note: required by a bound in `is_send`
93-
--> ui/not-send.rs:14:8
93+
--> $DIR/not-send.rs:14:8
9494
|
9595
12 | fn is_send<T>()
9696
| ------- required by a bound in this

suppressions.txt

+3
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ race:std::thread::scope
55
race:drop_in_place*JoinHandle
66
race:alloc::sync::Arc<*>::drop_slow
77
race:__call_tls_dtors
8+
9+
# false positives in memcpy (?)
10+
race:*memcpy*

0 commit comments

Comments
 (0)