Merge pull request #212 from muzarski/use-lazy-lock

lib: migrate to stable `LazyLock`
scylladb · Dec 3, 2024 · 81e668e · 81e668e
2 parents f1ed076 + fb85689
commit 81e668e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/scylla-rust-wrapper/Cargo.lock b/scylla-rust-wrapper/Cargo.lock
diff --git a/scylla-rust-wrapper/Cargo.toml b/scylla-rust-wrapper/Cargo.toml
@@ -14,7 +14,6 @@ scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v0
     "ssl",
 ] }
 tokio = { version = "1.27.0", features = ["full"] }
-lazy_static = "1.4.0"
 uuid = "1.1.2"
 machine-uid = "0.2.0"
 rand = "0.8.4"

diff --git a/scylla-rust-wrapper/src/lib.rs b/scylla-rust-wrapper/src/lib.rs
@@ -2,7 +2,7 @@
 
 use crate::logging::stderr_log_callback;
 use crate::logging::Logger;
-use lazy_static::lazy_static;
+use std::sync::LazyLock;
 use std::sync::RwLock;
 use tokio::runtime::Runtime;
 
@@ -110,13 +110,13 @@ pub mod cass_uuid_types {
     include_bindgen_generated!("cppdriver_uuid_types.rs");
 }
 
-lazy_static! {
-    pub static ref RUNTIME: Runtime = Runtime::new().unwrap();
-    pub static ref LOGGER: RwLock<Logger> = RwLock::new(Logger {
+pub static RUNTIME: LazyLock<Runtime> = LazyLock::new(|| Runtime::new().unwrap());
+pub static LOGGER: LazyLock<RwLock<Logger>> = LazyLock::new(|| {
+    RwLock::new(Logger {
         cb: Some(stderr_log_callback),
         data: std::ptr::null_mut(),
-    });
-}
+    })
+});
 
 // To send a Rust object to C: