diff options
| author | bors <bors@rust-lang.org> | 2015-11-23 20:08:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-23 20:08:49 +0000 |
| commit | 040a77f772d7693598499a161f53ed230fb61c52 (patch) | |
| tree | 71f1f369c9175a3655dff16f98465da8f2bce375 /src/libstd/sync | |
| parent | 8e9a97529d9fd112f338501e68e33bac1c41d1a4 (diff) | |
| parent | a613059e3fcfb751f7664f67a4a6c99faf436483 (diff) | |
| download | rust-040a77f772d7693598499a161f53ed230fb61c52.tar.gz rust-040a77f772d7693598499a161f53ed230fb61c52.zip | |
Auto merge of #29952 - petrochenkov:depr, r=brson
Part of https://github.com/rust-lang/rust/issues/29935 The deprecation lint is still called "deprecated", so people can continue using `#[allow(deprecated)]` and similar things.
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/condvar.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 389c9c4a066..d817a261f7c 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -166,7 +166,7 @@ impl Condvar { /// Like `wait`, the lock specified will be re-acquired when this function /// returns, regardless of whether the timeout elapsed or not. #[stable(feature = "rust1", since = "1.0.0")] - #[deprecated(since = "1.6.0", reason = "replaced by `std::sync::Condvar::wait_timeout`")] + #[rustc_deprecated(since = "1.6.0", reason = "replaced by `std::sync::Condvar::wait_timeout`")] #[allow(deprecated)] pub fn wait_timeout_ms<'a, T>(&self, guard: MutexGuard<'a, T>, ms: u32) -> LockResult<(MutexGuard<'a, T>, bool)> { @@ -290,7 +290,8 @@ impl StaticCondvar { #[unstable(feature = "static_condvar", reason = "may be merged with Condvar in the future", issue = "27717")] - #[deprecated(since = "1.6.0", reason = "replaced by `std::sync::StaticCondvar::wait_timeout`")] + #[rustc_deprecated(since = "1.6.0", + reason = "replaced by `std::sync::StaticCondvar::wait_timeout`")] pub fn wait_timeout_ms<'a, T>(&'static self, guard: MutexGuard<'a, T>, ms: u32) -> LockResult<(MutexGuard<'a, T>, bool)> { match self.wait_timeout(guard, Duration::from_millis(ms as u64)) { |