Skip to content

Commit

Permalink
feature = "atomic_from"
Browse files Browse the repository at this point in the history
  • Loading branch information
strake committed Oct 29, 2017
1 parent 5c21637 commit 80a3191
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libcore/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ impl<T> AtomicPtr<T> {
}
}

#[stable(feature = "rust1", since = "1.0.0")]
#[stable(feature = "atomic_from", since = "1.22.0")]
impl<T> From<*mut T> for AtomicPtr<T> {
#[inline]
fn from(p: *mut T) -> Self { Self::new(p) }
Expand Down Expand Up @@ -973,7 +973,7 @@ macro_rules! atomic_int {
}
}

#[$stable]
#[stable(feature = "atomic_from", since = "1.22.0")]
impl From<$int_type> for $atomic_type {
#[inline]
fn from(v: $int_type) -> Self { Self::new(v) }
Expand Down

0 comments on commit 80a3191

Please sign in to comment.