mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Rollup merge of #76075 - marmeladema:remove-once-cell-crate, r=matklad
datastructures: replace `once_cell` crate with an impl from std Fixes #75700 r? @matklad We might need a perf run for this change.
This commit is contained in:
commit
67f16431aa
@ -3420,7 +3420,6 @@ dependencies = [
|
|||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libc",
|
"libc",
|
||||||
"measureme",
|
"measureme",
|
||||||
"once_cell",
|
|
||||||
"parking_lot 0.10.2",
|
"parking_lot 0.10.2",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
"rustc-rayon",
|
"rustc-rayon",
|
||||||
|
@ -13,7 +13,6 @@ indexmap = "1.5.1"
|
|||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
jobserver_crate = { version = "0.1.13", package = "jobserver" }
|
jobserver_crate = { version = "0.1.13", package = "jobserver" }
|
||||||
lazy_static = "1"
|
lazy_static = "1"
|
||||||
once_cell = { version = "1", features = ["parking_lot"] }
|
|
||||||
rustc_serialize = { path = "../rustc_serialize" }
|
rustc_serialize = { path = "../rustc_serialize" }
|
||||||
rustc_macros = { path = "../rustc_macros" }
|
rustc_macros = { path = "../rustc_macros" }
|
||||||
rustc_graphviz = { path = "../rustc_graphviz" }
|
rustc_graphviz = { path = "../rustc_graphviz" }
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#![feature(extend_one)]
|
#![feature(extend_one)]
|
||||||
#![feature(const_panic)]
|
#![feature(const_panic)]
|
||||||
#![feature(const_generics)]
|
#![feature(const_generics)]
|
||||||
|
#![feature(once_cell)]
|
||||||
#![allow(rustc::default_hash_types)]
|
#![allow(rustc::default_hash_types)]
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
|
@ -229,7 +229,7 @@ cfg_if! {
|
|||||||
pub use std::cell::RefMut as LockGuard;
|
pub use std::cell::RefMut as LockGuard;
|
||||||
pub use std::cell::RefMut as MappedLockGuard;
|
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 InnerRwLock;
|
||||||
use std::cell::RefCell as InnerLock;
|
use std::cell::RefCell as InnerLock;
|
||||||
@ -314,7 +314,7 @@ cfg_if! {
|
|||||||
pub use parking_lot::MutexGuard as LockGuard;
|
pub use parking_lot::MutexGuard as LockGuard;
|
||||||
pub use parking_lot::MappedMutexGuard as MappedLockGuard;
|
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};
|
pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32, AtomicU64};
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
|
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
|
||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
|
#![feature(once_cell)]
|
||||||
#![recursion_limit = "256"]
|
#![recursion_limit = "256"]
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(generator_trait)]
|
#![feature(generator_trait)]
|
||||||
#![feature(generators)]
|
#![feature(generators)]
|
||||||
|
#![feature(once_cell)]
|
||||||
#![recursion_limit = "256"]
|
#![recursion_limit = "256"]
|
||||||
|
|
||||||
mod callbacks;
|
mod callbacks;
|
||||||
|
@ -38,6 +38,7 @@
|
|||||||
#![feature(exhaustive_patterns)]
|
#![feature(exhaustive_patterns)]
|
||||||
#![feature(extern_types)]
|
#![feature(extern_types)]
|
||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
|
#![feature(once_cell)]
|
||||||
#![feature(option_expect_none)]
|
#![feature(option_expect_none)]
|
||||||
#![feature(or_patterns)]
|
#![feature(or_patterns)]
|
||||||
#![feature(min_specialization)]
|
#![feature(min_specialization)]
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#![feature(crate_visibility_modifier)]
|
#![feature(crate_visibility_modifier)]
|
||||||
|
#![feature(once_cell)]
|
||||||
#![feature(or_patterns)]
|
#![feature(or_patterns)]
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
|
Loading…
Reference in New Issue
Block a user