diff options
| author | bors <bors@rust-lang.org> | 2016-01-23 16:21:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-23 16:21:07 +0000 |
| commit | 0486e12ad0661adcfdbd926dea17d7edfda419c1 (patch) | |
| tree | 313e2d985bcc9aca680a27e60a90182f48db2611 /src/libstd/sync | |
| parent | b78b9ae7b3dd03067c907e7a7ace970a8b26312d (diff) | |
| parent | feb2673654a6c1d6aeb36b451081032cd46a7390 (diff) | |
| download | rust-0486e12ad0661adcfdbd926dea17d7edfda419c1.tar.gz rust-0486e12ad0661adcfdbd926dea17d7edfda419c1.zip | |
Auto merge of #31148 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #30997, #31019, #31031, #31035, #31045, #31050, #31054, #31055, #31061, #31088, #31090, #31111, #31113, #31128, #31130, #31136, #31145, #31146 - Failed merges: #30932
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/semaphore.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/semaphore.rs b/src/libstd/sync/semaphore.rs index 8f08c840c21..ac5ce298c5c 100644 --- a/src/libstd/sync/semaphore.rs +++ b/src/libstd/sync/semaphore.rs @@ -13,7 +13,7 @@ of resources is currently unclear", issue = "27798")] #![rustc_deprecated(since = "1.7.0", - reason = "easily confused with system sempahores and not \ + reason = "easily confused with system semaphores and not \ used enough to pull its weight")] #![allow(deprecated)] |