about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorBaoshan <pangbw@gmail.com>2019-08-29 09:29:23 -0700
committerGitHub <noreply@github.com>2019-08-29 09:29:23 -0700
commit043c19c69c0beac3696cb82d44476ba4298a6b07 (patch)
tree1813e5dd1e4efd5806f401968b4ed34b8c9c76ac /src/libstd/sync
parentcae6d66d9989857e321e0963142b08b1517dc723 (diff)
parent76f17219c71973fd4a58f2f8020eec4d8f5dcd11 (diff)
downloadrust-043c19c69c0beac3696cb82d44476ba4298a6b07.tar.gz
rust-043c19c69c0beac3696cb82d44476ba4298a6b07.zip
Merge branch 'master' into bpang-runtest
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mod.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs
index e29faf18d83..fd6e46fd61d 100644
--- a/src/libstd/sync/mod.rs
+++ b/src/libstd/sync/mod.rs
@@ -163,7 +163,6 @@ pub use self::condvar::{Condvar, WaitTimeoutResult};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::mutex::{Mutex, MutexGuard};
 #[stable(feature = "rust1", since = "1.0.0")]
-#[cfg_attr(bootstrap, allow(deprecated_in_future))]
 #[allow(deprecated)]
 pub use self::once::{Once, OnceState, ONCE_INIT};
 #[stable(feature = "rust1", since = "1.0.0")]