Skip to content

Commit

Permalink
Auto merge of #48005 - panicbit:env_unimpl_send_sync, r=<try>
Browse files Browse the repository at this point in the history
Unimplement Send/Sync for ::env::{Args,ArgsOs,Vars,VarsOs}

Fixes #48004
  • Loading branch information
bors committed Feb 5, 2018
2 parents b0a396b + b439632 commit 7046949
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/libstd/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7046949

Please sign in to comment.