mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stabilize std::sync::atomic::Atomic*::{get_mut, into_inner}

Browse Source
This commit is contained in:
Aaron Turon 2016-12-14 12:13:12 -08:00
parent df26a5a958
commit e5363881a9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libcore/sync/atomic.rs
View File

@ -203,7 +203,6 @@ impl AtomicBool {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(atomic_access)]
/// use std::sync::atomic::{AtomicBool, Ordering}; /// use std::sync::atomic::{AtomicBool, Ordering};
/// ///
/// let mut some_bool = AtomicBool::new(true); /// let mut some_bool = AtomicBool::new(true);
@ -212,7 +211,7 @@ impl AtomicBool {
/// assert_eq!(some_bool.load(Ordering::SeqCst), false); /// assert_eq!(some_bool.load(Ordering::SeqCst), false);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "atomic_access", issue = "35603")] #[stable(feature = "atomic_access", since = "1.15.0")]
pub fn get_mut(&mut self) -> &mut bool { pub fn get_mut(&mut self) -> &mut bool {
unsafe { &mut *(self.v.get() as *mut bool) } unsafe { &mut *(self.v.get() as *mut bool) }
} }
@ -225,14 +224,13 @@ impl AtomicBool {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(atomic_access)]
/// use std::sync::atomic::AtomicBool; /// use std::sync::atomic::AtomicBool;
/// ///
/// let some_bool = AtomicBool::new(true); /// let some_bool = AtomicBool::new(true);
/// assert_eq!(some_bool.into_inner(), true); /// assert_eq!(some_bool.into_inner(), true);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "atomic_access", issue = "35603")] #[stable(feature = "atomic_access", since = "1.15.0")]
pub fn into_inner(self) -> bool { pub fn into_inner(self) -> bool {
unsafe { self.v.into_inner() != 0 } unsafe { self.v.into_inner() != 0 }
} }
@ -588,7 +586,6 @@ impl<T> AtomicPtr<T> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(atomic_access)]
/// use std::sync::atomic::{AtomicPtr, Ordering}; /// use std::sync::atomic::{AtomicPtr, Ordering};
/// ///
/// let mut atomic_ptr = AtomicPtr::new(&mut 10); /// let mut atomic_ptr = AtomicPtr::new(&mut 10);
@ -596,7 +593,7 @@ impl<T> AtomicPtr<T> {
/// assert_eq!(unsafe { *atomic_ptr.load(Ordering::SeqCst) }, 5); /// assert_eq!(unsafe { *atomic_ptr.load(Ordering::SeqCst) }, 5);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "atomic_access", issue = "35603")] #[stable(feature = "atomic_access", since = "1.15.0")]
pub fn get_mut(&mut self) -> &mut *mut T { pub fn get_mut(&mut self) -> &mut *mut T {
unsafe { &mut *self.p.get() } unsafe { &mut *self.p.get() }
} }
@ -609,14 +606,13 @@ impl<T> AtomicPtr<T> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(atomic_access)]
/// use std::sync::atomic::AtomicPtr; /// use std::sync::atomic::AtomicPtr;
/// ///
/// let atomic_ptr = AtomicPtr::new(&mut 5); /// let atomic_ptr = AtomicPtr::new(&mut 5);
/// assert_eq!(unsafe { *atomic_ptr.into_inner() }, 5); /// assert_eq!(unsafe { *atomic_ptr.into_inner() }, 5);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "atomic_access", issue = "35603")] #[stable(feature = "atomic_access", since = "1.15.0")]
pub fn into_inner(self) -> *mut T { pub fn into_inner(self) -> *mut T {
unsafe { self.p.into_inner() } unsafe { self.p.into_inner() }
} }
@ -883,7 +879,6 @@ macro_rules! atomic_int {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(atomic_access)]
/// use std::sync::atomic::{AtomicIsize, Ordering}; /// use std::sync::atomic::{AtomicIsize, Ordering};
/// ///
/// let mut some_isize = AtomicIsize::new(10); /// let mut some_isize = AtomicIsize::new(10);
@ -905,7 +900,6 @@ macro_rules! atomic_int {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(atomic_access)]
/// use std::sync::atomic::AtomicIsize; /// use std::sync::atomic::AtomicIsize;
/// ///
/// let some_isize = AtomicIsize::new(5); /// let some_isize = AtomicIsize::new(5);
@ -1261,7 +1255,7 @@ atomic_int!{
stable(feature = "rust1", since = "1.0.0"), stable(feature = "rust1", since = "1.0.0"),
stable(feature = "extended_compare_and_swap", since = "1.10.0"), stable(feature = "extended_compare_and_swap", since = "1.10.0"),
stable(feature = "atomic_debug", since = "1.3.0"), stable(feature = "atomic_debug", since = "1.3.0"),
unstable(feature = "atomic_access", issue = "35603"), stable(feature = "atomic_access", since = "1.15.0"),
isize AtomicIsize ATOMIC_ISIZE_INIT isize AtomicIsize ATOMIC_ISIZE_INIT
} }
#[cfg(target_has_atomic = "ptr")] #[cfg(target_has_atomic = "ptr")]
@ -1269,7 +1263,7 @@ atomic_int!{
stable(feature = "rust1", since = "1.0.0"), stable(feature = "rust1", since = "1.0.0"),
stable(feature = "extended_compare_and_swap", since = "1.10.0"), stable(feature = "extended_compare_and_swap", since = "1.10.0"),
stable(feature = "atomic_debug", since = "1.3.0"), stable(feature = "atomic_debug", since = "1.3.0"),
unstable(feature = "atomic_access", issue = "35603"), stable(feature = "atomic_access", since = "1.15.0"),
usize AtomicUsize ATOMIC_USIZE_INIT usize AtomicUsize ATOMIC_USIZE_INIT
} }