diff options
| author | bors <bors@rust-lang.org> | 2018-01-05 10:07:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-05 10:07:47 +0000 |
| commit | dd582ac38ec066859334061e71faf2631220d98b (patch) | |
| tree | c77ea210e9d64e5e93e4460daffa6629d0e21bf7 /src/libstd/sync | |
| parent | 8a11b8cdd7cc7214c2bb9e77a6c961dd4dad9b7c (diff) | |
| parent | 3fcb99575962660be1989e7176dd36444f6fa41b (diff) | |
| download | rust-dd582ac38ec066859334061e71faf2631220d98b.tar.gz rust-dd582ac38ec066859334061e71faf2631220d98b.zip | |
Auto merge of #47214 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #47030, #47033, #47110, #47149, #47150, #47160, #47162, #47182, #47198, #47199 - Failed merges:
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`]. |