about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-02-14 16:14:30 +0800
committerGitHub <noreply@github.com>2018-02-14 16:14:30 +0800
commitc88a6fe569bb599c0b2f8fa48a9d72ef9d717897 (patch)
treeda13dbab62accffa6632a9f6b1571b15208becbd
parent2be44ceaa207f6a29f2c10399b524e8700ec173d (diff)
parentb439632a759447eb56a0190f6c838934bad1e3c7 (diff)
downloadrust-c88a6fe569bb599c0b2f8fa48a9d72ef9d717897.tar.gz
rust-c88a6fe569bb599c0b2f8fa48a9d72ef9d717897.zip
Rollup merge of #48005 - panicbit:env_unimpl_send_sync, r=alexcrichton
Unimplement Send/Sync for ::env::{Args,ArgsOs,Vars,VarsOs}

Fixes #48004
-rw-r--r--src/libstd/env.rs12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs
index 27bf326631f..c4946b6b282 100644
--- a/src/libstd/env.rs
+++ b/src/libstd/env.rs
@@ -723,6 +723,12 @@ pub fn args_os() -> ArgsOs {
     ArgsOs { inner: sys::args::args() }
 }
 
+#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
+impl !Send for Args {}
+
+#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
+impl !Sync for Args {}
+
 #[stable(feature = "env", since = "1.0.0")]
 impl Iterator for Args {
     type Item = String;
@@ -754,6 +760,12 @@ impl fmt::Debug for Args {
     }
 }
 
+#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
+impl !Send for ArgsOs {}
+
+#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
+impl !Sync for ArgsOs {}
+
 #[stable(feature = "env", since = "1.0.0")]
 impl Iterator for ArgsOs {
     type Item = OsString;