Skip to content

Commit 8c6b634

Browse files
committed
Auto merge of #2528 - workingjubilee:scope-wasi, r=joshtriplett
Scope in Send, Sync for wasi Without this, libc fails during the build of rustc. See rust-lang/rust#90681 This dependency was introduced in #2499. Alternative solution: It's not clear this is necessary for core to finish building, so maybe we should `#[cfg]` it out in that case, instead?
2 parents 67bf22c + 41a8647 commit 8c6b634

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ cfg_if! {
6363
use core::clone::Clone;
6464
#[doc(hidden)]
6565
#[allow(unused_imports)]
66-
use core::marker::Copy;
66+
use core::marker::{Copy, Send, Sync};
6767
#[doc(hidden)]
6868
#[allow(unused_imports)]
6969
use core::option::Option;
@@ -85,7 +85,7 @@ cfg_if! {
8585
pub use core::clone::Clone;
8686
#[doc(hidden)]
8787
#[allow(unused_imports)]
88-
pub use core::marker::Copy;
88+
pub use core::marker::{Copy, Send, Sync};
8989
#[doc(hidden)]
9090
#[allow(unused_imports)]
9191
pub use core::option::Option;

src/wasi.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use super::{Send, Sync};
2+
13
pub use ffi::c_void;
24

35
pub type c_char = i8;

0 commit comments

Comments
 (0)