Merge pull request #1388 from dtolnay/oncelock

Replace once_cell with standard library OnceLock

Author: dtolnay

BUCK

@@ -73,7 +73,6 @@ rust_library(
     deps = [
         "//third-party:cc",
         "//third-party:codespan-reporting",
-        "//third-party:once_cell",
         "//third-party:proc-macro2",
         "//third-party:quote",
         "//third-party:scratch",

BUILD

@@ -69,7 +69,6 @@ rust_library(
     deps = [
         "@crates.io//:cc",
         "@crates.io//:codespan-reporting",
-        "@crates.io//:once_cell",
         "@crates.io//:proc-macro2",
         "@crates.io//:quote",
         "@crates.io//:scratch",

MODULE.bazel.lock

@@ -21,7 +21,6 @@ experimental-async-fn = []
 [dependencies]
 cc = "1.0.83"
 codespan-reporting = "0.11.1"
-once_cell = "1.18"
 proc-macro2 = { version = "1.0.74", default-features = false, features = ["span-locations"] }
 quote = { version = "1.0.35", default-features = false }
 scratch = "1.0.5"

gen/build/Cargo.toml

@@ -1,11 +1,11 @@
 use crate::gen::{CfgEvaluator, CfgResult};
-use once_cell::sync::OnceCell;
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::collections::{BTreeMap as Map, BTreeSet as Set};
 use std::env;
+use std::sync::OnceLock;
 
-static ENV: OnceCell<CargoEnv> = OnceCell::new();
+static ENV: OnceLock<CargoEnv> = OnceLock::new();
 
 struct CargoEnv {
     features: Set<Name>,

gen/build/src/cargo.rs

@@ -344,12 +344,11 @@ mod r#impl {
     use crate::intern::{intern, InternedString};
     use crate::syntax::map::UnorderedMap as Map;
     use crate::vec::{self, InternedVec as _};
-    use once_cell::sync::Lazy;
     use std::cell::RefCell;
     use std::fmt::{self, Debug};
     use std::marker::PhantomData;
     use std::ops::{Deref, DerefMut};
-    use std::sync::{PoisonError, RwLock};
+    use std::sync::{OnceLock, PoisonError, RwLock};
 
     struct CurrentCfg {
         include_prefix: InternedString,
@@ -378,7 +377,10 @@ mod r#impl {
         }
     }
 
-    static CURRENT: Lazy<RwLock<CurrentCfg>> = Lazy::new(|| RwLock::new(CurrentCfg::default()));
+    fn current() -> &'static RwLock<CurrentCfg> {
+        static CURRENT: OnceLock<RwLock<CurrentCfg>> = OnceLock::new();
+        CURRENT.get_or_init(|| RwLock::new(CurrentCfg::default()))
+    }
 
     thread_local! {
         // FIXME: If https://github.com/rust-lang/rust/issues/77425 is resolved,
@@ -401,7 +403,7 @@ mod r#impl {
 
     impl<'a> Cfg<'a> {
         fn current() -> super::Cfg<'a> {
-            let current = CURRENT.read().unwrap_or_else(PoisonError::into_inner);
+            let current = current().read().unwrap_or_else(PoisonError::into_inner);
             let include_prefix = current.include_prefix.str();
             let exported_header_dirs = current.exported_header_dirs.vec();
             let exported_header_prefixes = current.exported_header_prefixes.vec();
@@ -481,7 +483,7 @@ mod r#impl {
                     doxygen,
                     marker: _,
                 } = cfg;
-                let mut current = CURRENT.write().unwrap_or_else(PoisonError::into_inner);
+                let mut current = current().write().unwrap_or_else(PoisonError::into_inner);
                 current.include_prefix = intern(include_prefix);
                 current.exported_header_dirs = vec::intern(exported_header_dirs);
                 current.exported_header_prefixes = vec::intern(exported_header_prefixes);

gen/build/src/cfg.rs

@@ -1,6 +1,5 @@
 use crate::syntax::set::UnorderedSet as Set;
-use once_cell::sync::OnceCell;
-use std::sync::{Mutex, PoisonError};
+use std::sync::{Mutex, OnceLock, PoisonError};
 
 #[derive(Copy, Clone, Default)]
 pub(crate) struct InternedString(&'static str);
@@ -12,7 +11,7 @@ impl InternedString {
 }
 
 pub(crate) fn intern(s: &str) -> InternedString {
-    static INTERN: OnceCell<Mutex<Set<&'static str>>> = OnceCell::new();
+    static INTERN: OnceLock<Mutex<Set<&'static str>>> = OnceLock::new();
 
     let mut set = INTERN
         .get_or_init(|| Mutex::new(Set::new()))

gen/build/src/intern.rs

@@ -10,7 +10,6 @@ rust-version = "1.77"
 cc = "1.0.83"
 clap = { version = "4", default-features = false, features = ["error-context", "help", "std", "usage"] }
 codespan-reporting = "0.11.1"
-once_cell = "1.9"
 proc-macro2 = { version = "1.0.58", features = ["span-locations"] }
 quote = "1.0.4"
 scratch = "1"