diff options
| author | kennytm <kennytm@gmail.com> | 2018-01-05 17:22:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 17:22:04 +0800 |
| commit | 63c8e0c86b1808375e4da488225abb5185644f1f (patch) | |
| tree | 596e96aff800d1228218535444d8aab846757b72 /src/libstd/sync | |
| parent | 8a11b8cdd7cc7214c2bb9e77a6c961dd4dad9b7c (diff) | |
| parent | a8d107be258514261a9366a8a384e370eb0a9628 (diff) | |
| download | rust-63c8e0c86b1808375e4da488225abb5185644f1f.tar.gz rust-63c8e0c86b1808375e4da488225abb5185644f1f.zip | |
Rollup merge of #47030 - ollie27:stab, r=alexcrichton
Correct a few stability attributes * The extra impls for `ManuallyDrop` were added in #44310 which was only stabilised in 1.22.0. * The impls for `SliceIndex` were stabilised in #43373 but as `RangeInclusive` and `RangeToInclusive` are still unstable the impls should remain unstable. * The `From` impls for atomic integers were added in #45610 but most atomic integers are still unstable. * The `shared_from_slice2` impls were added in #45990 but they won't be stable until 1.24.0. * The `Mutex` and `RwLock` impls were added in #46082 but won't be stable until 1.24.0.
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mutex.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/rwlock.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 81f5594bc52..3b4904c98e8 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -382,7 +382,7 @@ unsafe impl<#[may_dangle] T: ?Sized> Drop for Mutex<T> { } } -#[stable(feature = "mutex_from", since = "1.22.0")] +#[stable(feature = "mutex_from", since = "1.24.0")] impl<T> From<T> for Mutex<T> { /// Creates a new mutex in an unlocked state ready for use. /// This is equivalent to [`Mutex::new`]. diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index fd6cff6b69c..0f3f4e50f7e 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -457,7 +457,7 @@ impl<T: Default> Default for RwLock<T> { } } -#[stable(feature = "rw_lock_from", since = "1.22.0")] +#[stable(feature = "rw_lock_from", since = "1.24.0")] impl<T> From<T> for RwLock<T> { /// Creates a new instance of an `RwLock<T>` which is unlocked. /// This is equivalent to [`RwLock::new`]. |
