Skip to content

Commit 1b00ebe

Browse files
committed
Update !DynSend and !DynSync platform impls
These have grown out of sync with the platforms.
1 parent 6518bcb commit 1b00ebe

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

compiler/rustc_data_structures/src/marker.rs

+18-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,15 @@ impls_dyn_send_neg!(
3939
[std::io::StderrLock<'_>]
4040
);
4141

42-
#[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))]
43-
// Consistent with `std`, `os_imp::Env` is `!Sync` in these platforms
42+
#[cfg(any(
43+
unix,
44+
target_os = "hermit",
45+
all(target_vendor = "fortanix", target_env = "sgx"),
46+
target_os = "solid_asp3",
47+
target_os = "wasi",
48+
target_os = "xous"
49+
))]
50+
// Consistent with `std`, `env_imp::Env` is `!Sync` in these platforms
4451
impl !DynSend for std::env::VarsOs {}
4552

4653
macro_rules! already_send {
@@ -106,8 +113,15 @@ impls_dyn_sync_neg!(
106113
[std::sync::mpsc::Sender<T> where T]
107114
);
108115

109-
#[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))]
110-
// Consistent with `std`, `os_imp::Env` is `!Sync` in these platforms
116+
#[cfg(any(
117+
unix,
118+
target_os = "hermit",
119+
all(target_vendor = "fortanix", target_env = "sgx"),
120+
target_os = "solid_asp3",
121+
target_os = "wasi",
122+
target_os = "xous"
123+
))]
124+
// Consistent with `std`, `env_imp::Env` is `!Sync` in these platforms
111125
impl !DynSync for std::env::VarsOs {}
112126

113127
macro_rules! already_sync {

0 commit comments

Comments
 (0)