diff options
| author | bors <bors@rust-lang.org> | 2016-01-17 12:23:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-17 12:23:57 +0000 |
| commit | bff52927f582e2ca8dea799bd58f06e654295e21 (patch) | |
| tree | 2286b17c8092d1e6a9a026ef979dd7ecd333b348 /src/libstd/sync | |
| parent | 0b524edb043c22a577968290fed1a4ff9936a28a (diff) | |
| parent | 00a4eeadaf10156e2e2b7a0c050c2ca1ac826f76 (diff) | |
| download | rust-bff52927f582e2ca8dea799bd58f06e654295e21.tar.gz rust-bff52927f582e2ca8dea799bd58f06e654295e21.zip | |
Auto merge of #30975 - Manishearth:rollup, r=Manishearth
- Successful merges: #30938, #30940, #30943, #30949, #30952, #30957, #30959 - Failed merges:
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mod.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sync/semaphore.rs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs index e1b7930b6d8..9c9aa20eff5 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -39,6 +39,7 @@ pub use self::rwlock::{RwLockReadGuard, RwLockWriteGuard}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::rwlock::{RwLock, StaticRwLock, RW_LOCK_INIT}; #[stable(feature = "rust1", since = "1.0.0")] +#[allow(deprecated)] pub use self::semaphore::{Semaphore, SemaphoreGuard}; pub mod mpsc; diff --git a/src/libstd/sync/semaphore.rs b/src/libstd/sync/semaphore.rs index 891f8775ff2..8f08c840c21 100644 --- a/src/libstd/sync/semaphore.rs +++ b/src/libstd/sync/semaphore.rs @@ -12,6 +12,10 @@ reason = "the interaction between semaphores and the acquisition/release \ of resources is currently unclear", issue = "27798")] +#![rustc_deprecated(since = "1.7.0", + reason = "easily confused with system sempahores and not \ + used enough to pull its weight")] +#![allow(deprecated)] use ops::Drop; use sync::{Mutex, Condvar}; |