Merge pull request #28998 from petrosagg/remove-once-cell

remove `once_cell` in favor of `std::sync::LazyLock`
MaterializeInc · Aug 26, 2024 · 65f0874 · 65f0874
2 parents c7b5c41 + 2d8c853
commit 65f0874
Show file tree

Hide file tree

Showing 107 changed files with 1,470 additions and 1,496 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/misc/bazel/cargo-gazelle/Cargo.toml b/misc/bazel/cargo-gazelle/Cargo.toml
@@ -19,7 +19,6 @@ cargo_toml = "0.19.1"
 clap = { version = "3.2.24", features = ["derive"] }
 convert_case = "0.6"
 guppy = "0.17.5"
-once_cell = "1.16.0"
 proc-macro2 = "1.0.60"
 protobuf-parse = "3.4.0"
 quote = "1.0.23"

diff --git a/misc/bazel/cargo-gazelle/src/config.rs b/misc/bazel/cargo-gazelle/src/config.rs
@@ -11,7 +11,7 @@ use std::borrow::Cow;
 use std::collections::BTreeMap;
 
 use guppy::graph::PackageMetadata;
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 use crate::targets::{AdditiveContent, RustTestSize};
 
@@ -117,12 +117,12 @@ impl CrateConfig {
     }
 
     pub fn test(&self, name: &str) -> &TestConfig {
-        static EMPTY_TEST: Lazy<TestConfig> = Lazy::new(TestConfig::default);
+        static EMPTY_TEST: LazyLock<TestConfig> = LazyLock::new(TestConfig::default);
         self.tests.get(name).unwrap_or(&*EMPTY_TEST)
     }
 
     pub fn binary(&self, name: &str) -> &BinaryConfig {
-        static EMPTY_BINARY: Lazy<BinaryConfig> = Lazy::new(BinaryConfig::default);
+        static EMPTY_BINARY: LazyLock<BinaryConfig> = LazyLock::new(BinaryConfig::default);
         self.binaries.get(name).unwrap_or(&*EMPTY_BINARY)
     }
 }

diff --git a/misc/bazel/cargo-gazelle/src/platforms.rs b/misc/bazel/cargo-gazelle/src/platforms.rs
@@ -10,23 +10,23 @@
 use std::sync::Arc;
 
 use guppy::platform::{Platform, PlatformSpec, TargetFeatures, Triple};
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 use crate::ToBazelDefinition;
 
-static AARCH64_MAC_OS: Lazy<PlatformSpec> = Lazy::new(|| {
+static AARCH64_MAC_OS: LazyLock<PlatformSpec> = LazyLock::new(|| {
     let triple = Triple::new("aarch64-apple-darwin").unwrap();
     PlatformSpec::Platform(Arc::new(Platform::from_triple(triple, TargetFeatures::All)))
 });
-static X86_64_MAC_OS: Lazy<PlatformSpec> = Lazy::new(|| {
+static X86_64_MAC_OS: LazyLock<PlatformSpec> = LazyLock::new(|| {
     let triple = Triple::new("x86_64-apple-darwin").unwrap();
     PlatformSpec::Platform(Arc::new(Platform::from_triple(triple, TargetFeatures::All)))
 });
-static AARCH64_LINUX_GNU: Lazy<PlatformSpec> = Lazy::new(|| {
+static AARCH64_LINUX_GNU: LazyLock<PlatformSpec> = LazyLock::new(|| {
     let triple = Triple::new("aarch64-unknown-linux-gnu").unwrap();
     PlatformSpec::Platform(Arc::new(Platform::from_triple(triple, TargetFeatures::All)))
 });
-static X86_64_LINUX_GNU: Lazy<PlatformSpec> = Lazy::new(|| {
+static X86_64_LINUX_GNU: LazyLock<PlatformSpec> = LazyLock::new(|| {
     let triple = Triple::new("x86_64-unknown-linux-gnu").unwrap();
     PlatformSpec::Platform(Arc::new(Platform::from_triple(triple, TargetFeatures::All)))
 });

diff --git a/src/adapter/Cargo.toml b/src/adapter/Cargo.toml
@@ -27,7 +27,6 @@ governor = "0.6.0"
 hex = "0.4.3"
 http = "1.1.0"
 itertools = "0.10.5"
-once_cell = "1.16.0"
 launchdarkly-server-sdk = { version = "1.0.0", default-features = false, features = [
     "hypertls",
 ] }

diff --git a/src/adapter/src/catalog/state.rs b/src/adapter/src/catalog/state.rs
@@ -14,6 +14,7 @@ use std::collections::{BTreeMap, BTreeSet, VecDeque};
 use std::fmt::Debug;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
+use std::sync::LazyLock;
 use std::time::Instant;
 
 use itertools::Itertools;
@@ -78,7 +79,6 @@ use mz_storage_types::connections::inline::{
     ConnectionResolver, InlinedConnection, IntoInlineConnection,
 };
 use mz_storage_types::connections::ConnectionContext;
-use once_cell::sync::Lazy;
 use serde::Serialize;
 use timely::progress::Antichain;
 use tokio::sync::mpsc;
@@ -1642,9 +1642,9 @@ impl CatalogState {
         name: &PartialItemName,
         conn_id: &ConnectionId,
     ) -> Result<&CatalogEntry, SqlCatalogError> {
-        static NON_PG_CATALOG_TYPES: Lazy<
+        static NON_PG_CATALOG_TYPES: LazyLock<
             BTreeMap<&'static str, &'static BuiltinType<NameReference>>,
-        > = Lazy::new(|| {
+        > = LazyLock::new(|| {
             BUILTINS::types()
                 .filter(|typ| typ.schema != PG_CATALOG_SCHEMA)
                 .map(|typ| (typ.name, typ))