Skip to content

Commit

Permalink
Auto merge of #2528 - workingjubilee:scope-wasi, r=joshtriplett
Browse files Browse the repository at this point in the history
Scope in Send, Sync for wasi

Without this, libc fails during the build of rustc. See: rust-lang/rust#90681

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?
  • Loading branch information
bors committed Nov 11, 2021
2 parents d4ac6fd + 41a8647 commit ff62cb2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/lib.rs
Expand Up @@ -63,7 +63,7 @@ cfg_if! {
use core::clone::Clone;
#[doc(hidden)]
#[allow(unused_imports)]
use core::marker::Copy;
use core::marker::{Copy, Send, Sync};
#[doc(hidden)]
#[allow(unused_imports)]
use core::option::Option;
Expand All @@ -85,7 +85,7 @@ cfg_if! {
pub use core::clone::Clone;
#[doc(hidden)]
#[allow(unused_imports)]
pub use core::marker::Copy;
pub use core::marker::{Copy, Send, Sync};
#[doc(hidden)]
#[allow(unused_imports)]
pub use core::option::Option;
Expand Down
2 changes: 2 additions & 0 deletions src/wasi.rs
@@ -1,3 +1,5 @@
use super::{Send, Sync};

pub use ffi::c_void;

pub type c_char = i8;
Expand Down

0 comments on commit ff62cb2

Please sign in to comment.