From 62f648660c5a8e8be364950d6a8641779f735245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Uzarski?= <mikolaj.uzarski@scylladb.com>
Date: Mon, 2 Dec 2024 16:27:40 +0100
Subject: [PATCH 1/2] globals: migrate to LazyLock

std::sync::LazyLock (https://doc.rust-lang.org/beta/std/sync/struct.LazyLock.html)
is now stable. We can migrate to it, instead of using external `lazy_static`
dependency.
---
 scylla-rust-wrapper/src/lib.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scylla-rust-wrapper/src/lib.rs b/scylla-rust-wrapper/src/lib.rs
index 9f027fdf..5d4094c8 100644
--- 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:
 

From fb856896bd14091b1338f46bff120a1a1b43a071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Uzarski?= <mikolaj.uzarski@scylladb.com>
Date: Mon, 2 Dec 2024 16:28:47 +0100
Subject: [PATCH 2/2] cargo: remove lazy_static dependency

It's not used anymore.
---
 scylla-rust-wrapper/Cargo.lock | 3 +--
 scylla-rust-wrapper/Cargo.toml | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/scylla-rust-wrapper/Cargo.lock b/scylla-rust-wrapper/Cargo.lock
index c99bdcee..5b0ca0b2 100644
--- a/scylla-rust-wrapper/Cargo.lock
+++ b/scylla-rust-wrapper/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -1065,7 +1065,6 @@ dependencies = [
  "bindgen",
  "chrono",
  "futures",
- "lazy_static",
  "libc",
  "machine-uid",
  "ntest",
diff --git a/scylla-rust-wrapper/Cargo.toml b/scylla-rust-wrapper/Cargo.toml
index ada90c61..b2377c46 100644
--- 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"