nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utilize PhantomData to enforce !Sync and !Send field.

Browse Source
This commit is contained in:
Corey Farwell 2016-08-06 14:42:22 -04:00
parent 444ff9fbfb
commit 28218bed8f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libstd/sys/unix/os.rs
View File

@ -21,6 +21,7 @@ use fmt;
use io; use io;
use iter; use iter;
use libc::{self, c_int, c_char, c_void}; use libc::{self, c_int, c_char, c_void};
use marker::PhantomData;
use mem; use mem;
use memchr; use memchr;
use path::{self, PathBuf}; use path::{self, PathBuf};
@ -304,7 +305,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
pub struct Args { pub struct Args {
iter: vec::IntoIter<OsString>, iter: vec::IntoIter<OsString>,
_dont_send_or_sync_me: *mut (), _dont_send_or_sync_me: PhantomData<*mut ()>,
} }
impl Iterator for Args { impl Iterator for Args {
@ -342,7 +343,7 @@ pub fn args() -> Args {
}; };
Args { Args {
iter: vec.into_iter(), iter: vec.into_iter(),
_dont_send_or_sync_me: ptr::null_mut(), _dont_send_or_sync_me: PhantomData,
} }
} }
@ -399,7 +400,7 @@ pub fn args() -> Args {
} }
} }
Args { iter: res.into_iter(), _dont_send_or_sync_me: ptr::null_mut() } Args { iter: res.into_iter(), _dont_send_or_sync_me: PhantomData }
} }
#[cfg(any(target_os = "linux", #[cfg(any(target_os = "linux",
@ -418,12 +419,12 @@ pub fn args() -> Args {
let v: Vec<OsString> = bytes.into_iter().map(|v| { let v: Vec<OsString> = bytes.into_iter().map(|v| {
OsStringExt::from_vec(v) OsStringExt::from_vec(v)
}).collect(); }).collect();
Args { iter: v.into_iter(), _dont_send_or_sync_me: ptr::null_mut() } Args { iter: v.into_iter(), _dont_send_or_sync_me: PhantomData }
} }
pub struct Env { pub struct Env {
iter: vec::IntoIter<(OsString, OsString)>, iter: vec::IntoIter<(OsString, OsString)>,
_dont_send_or_sync_me: *mut (), _dont_send_or_sync_me: PhantomData<*mut ()>,
} }
impl Iterator for Env { impl Iterator for Env {
@ -464,7 +465,7 @@ pub fn env() -> Env {
} }
let ret = Env { let ret = Env {
iter: result.into_iter(), iter: result.into_iter(),
_dont_send_or_sync_me: ptr::null_mut(), _dont_send_or_sync_me: PhantomData,
}; };
ENV_LOCK.unlock(); ENV_LOCK.unlock();
return ret return ret