diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-12-26 14:25:39 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2022-01-01 16:53:47 +0100 |
| commit | 2fe2728fa900a708d2c70342d9d6737e5462cf5d (patch) | |
| tree | c064feebd291e73afc7f6979ef7d54452de85b45 | |
| parent | 028c6f1454787c068ff5117e9000a1de4fd98374 (diff) | |
| download | rust-2fe2728fa900a708d2c70342d9d6737e5462cf5d.tar.gz rust-2fe2728fa900a708d2c70342d9d6737e5462cf5d.zip | |
Remove the lazy_static dependency from rustbuild
Rustbuild already depends on once_cell which in the future can be replaced with std::lazy::Lazy.
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/bootstrap/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/bootstrap/cache.rs | 7 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 959c8161e98..b7148883704 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -175,7 +175,6 @@ dependencies = [ "filetime", "getopts", "ignore", - "lazy_static", "libc", "merge", "num_cpus", diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index 1ce1f0b26db..9ad453497f6 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -44,7 +44,6 @@ libc = "0.2" serde = { version = "1.0.8", features = ["derive"] } serde_json = "1.0.2" toml = "0.5" -lazy_static = "1.3.0" time = "0.1" ignore = "0.4.10" opener = "0.5" diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs index 0c16fae01bc..fac5d8db511 100644 --- a/src/bootstrap/cache.rs +++ b/src/bootstrap/cache.rs @@ -13,7 +13,8 @@ use std::ops::Deref; use std::path::{Path, PathBuf}; use std::sync::Mutex; -use lazy_static::lazy_static; +// FIXME: replace with std::lazy after it gets stabilized and reaches beta +use once_cell::sync::Lazy; use crate::builder::Step; @@ -222,9 +223,7 @@ impl Interner { } } -lazy_static! { - pub static ref INTERNER: Interner = Interner::default(); -} +pub static INTERNER: Lazy<Interner> = Lazy::new(Interner::default); /// This is essentially a `HashMap` which allows storing any type in its input and /// any type in its output. It is a write-once cache; values are never evicted, |