diff options
| author | bors <bors@rust-lang.org> | 2020-08-31 13:30:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-31 13:30:13 +0000 |
| commit | 1fd8636d2428658cf46df53fb4f445558689fd1c (patch) | |
| tree | 80c3f9bec7279f5d98c0d7e77588d2754072ee5e /compiler/rustc_data_structures/src | |
| parent | 3b4797cb598260b96dd8d6e47cd429210e14c1f6 (diff) | |
| parent | 9caf08f05291276288defa6fba7a4fb5c0e56ade (diff) | |
| download | rust-1fd8636d2428658cf46df53fb4f445558689fd1c.tar.gz rust-1fd8636d2428658cf46df53fb4f445558689fd1c.zip | |
Auto merge of #76159 - matklad:rollup-8jydjg3, r=matklad
Rollup of 5 pull requests Successful merges: - #75938 (Added some `min_const_generics` revisions into `const_generics` tests) - #76050 (Remove unused function) - #76075 (datastructures: replace `once_cell` crate with an impl from std) - #76115 (Restore public visibility on some parsing functions for rustfmt) - #76127 (rustbuild: Remove one LLD workaround) Failed merges: r? @ghost
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/lib.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/sync.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs index af4a7bd1881..78b7e08ceed 100644 --- a/compiler/rustc_data_structures/src/lib.rs +++ b/compiler/rustc_data_structures/src/lib.rs @@ -26,6 +26,7 @@ #![feature(extend_one)] #![feature(const_panic)] #![feature(const_generics)] +#![feature(once_cell)] #![allow(rustc::default_hash_types)] #[macro_use] diff --git a/compiler/rustc_data_structures/src/sync.rs b/compiler/rustc_data_structures/src/sync.rs index 53d831749ce..d22f3adfb01 100644 --- a/compiler/rustc_data_structures/src/sync.rs +++ b/compiler/rustc_data_structures/src/sync.rs @@ -229,7 +229,7 @@ cfg_if! { pub use std::cell::RefMut as LockGuard; pub use std::cell::RefMut as MappedLockGuard; - pub use once_cell::unsync::OnceCell; + pub use std::lazy::OnceCell; use std::cell::RefCell as InnerRwLock; use std::cell::RefCell as InnerLock; @@ -314,7 +314,7 @@ cfg_if! { pub use parking_lot::MutexGuard as LockGuard; pub use parking_lot::MappedMutexGuard as MappedLockGuard; - pub use once_cell::sync::OnceCell; + pub use std::lazy::SyncOnceCell as OnceCell; pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32, AtomicU64}; |
