about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorBaoshan <pangbw@gmail.com>2019-08-20 15:43:55 -0700
committerGitHub <noreply@github.com>2019-08-20 15:43:55 -0700
commit0c8a14c7fb34d6edbc2b24495bb0774aeae27b98 (patch)
tree49f35638545ccd98762e91fc712d09533ad869e5 /src/libstd/sync
parent7ab6fa09143f87414485e25cfc29727f5d1f0b8a (diff)
parentbea0372a1a7a31b81f28cc4d9a83a2dc9a79d008 (diff)
downloadrust-0c8a14c7fb34d6edbc2b24495bb0774aeae27b98.tar.gz
rust-0c8a14c7fb34d6edbc2b24495bb0774aeae27b98.zip
Merge pull request #6 from rust-lang/master
rebase code from rust-lang/rust master branch
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")]