replace lazy_static with LazyLock

cloudwego · Aug 16, 2024 · 18870f2 · 18870f2
1 parent b7b1884
commit 18870f2
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 152 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ edition = "2021"
 homepage = "https://www.cloudwego.io/docs/volo/"
 repository = "https://github.com/cloudwego/volo"
 license = "MIT OR Apache-2.0"
-rust-version = "1.77.0"
+rust-version = "1.80.0"
 
 [workspace.dependencies]
 pilota = "0.11"
@@ -69,7 +69,6 @@ hyper-timeout = "0.5"
 hyper-util = "0.1"
 itertools = "0.13"
 itoa = "1"
-lazy_static = "1"
 libc = "0.2"
 linkedbytes = "0.1"
 linked-hash-map = "0.5"
@@ -133,7 +132,7 @@ webpki-roots = "0.26"
 tokio-rustls = "0.25"
 native-tls = "0.2"
 tokio-native-tls = "0.3"
-tokio-tungstenite="0.23.1"
+tokio-tungstenite = "0.23.1"
 
 [profile.release]
 opt-level = 3

diff --git a/benchmark/Cargo.toml b/benchmark/Cargo.toml
@@ -22,7 +22,6 @@ chrono.workspace = true
 clap = { workspace = true, features = ["derive"] }
 faststr.workspace = true
 governor.workspace = true
-lazy_static.workspace = true
 metainfo.workspace = true
 motore.workspace = true
 serde.workspace = true

diff --git a/benchmark/src/bin/server.rs b/benchmark/src/bin/server.rs
@@ -1,17 +1,14 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
 use anyhow::anyhow;
 use benchmark::{
     benchmark::echo::{EchoServer, ObjReq, ObjResp, Request, Response},
     perf::Recoder,
     runner::processor::process_request,
 };
-use lazy_static::lazy_static;
 use volo_thrift::ServerError;
 
-lazy_static! {
-    static ref RECODER: Recoder = Recoder::new("VOLO@Server");
-}
+static RECODER: LazyLock<Recoder> = LazyLock::new(|| Recoder::new("VOLO@Server"));
 
 pub struct S;
 

diff --git a/benchmark/src/perf/mod.rs b/benchmark/src/perf/mod.rs
@@ -13,6 +13,7 @@ pub struct Recoder {
     mem: Arc<UnsafeCell<Vec<u64>>>,
 }
 
+unsafe impl Send for Recoder {}
 unsafe impl Sync for Recoder {}
 
 impl Recoder {

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -119,7 +119,6 @@ http-body.workspace = true
 http-body-util.workspace = true
 hyper.workspace = true
 hyper-util.workspace = true
-lazy_static.workspace = true
 metainfo.workspace = true
 motore.workspace = true
 serde.workspace = true

diff --git a/examples/src/grpc/compression/client.rs b/examples/src/grpc/compression/client.rs
@@ -1,27 +1,24 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
-use lazy_static::lazy_static;
 use pilota::FastStr;
 use volo_grpc::codec::compression::{
     CompressionEncoding::{Gzip, Identity, Zlib},
     GzipConfig, Level, ZlibConfig,
 };
 
-lazy_static! {
-    static ref CLIENT: volo_gen::proto_gen::helloworld::GreeterClient = {
-        let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
-        volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
-            .send_compressions(vec![
-                Gzip(Some(GzipConfig::default())),
-                Zlib(Some(ZlibConfig {
-                    level: Level::fast(),
-                })),
-            ])
-            .accept_compressions(vec![Gzip(None), Identity])
-            .address(addr)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::proto_gen::helloworld::GreeterClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
+    volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
+        .send_compressions(vec![
+            Gzip(Some(GzipConfig::default())),
+            Zlib(Some(ZlibConfig {
+                level: Level::fast(),
+            })),
+        ])
+        .accept_compressions(vec![Gzip(None), Identity])
+        .address(addr)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/examples/src/grpc/hello/client.rs b/examples/src/grpc/hello/client.rs
@@ -1,16 +1,13 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
-use lazy_static::lazy_static;
 use pilota::FastStr;
 
-lazy_static! {
-    static ref CLIENT: volo_gen::proto_gen::helloworld::GreeterClient = {
-        let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
-        volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
-            .address(addr)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::proto_gen::helloworld::GreeterClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
+    volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
+        .address(addr)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/examples/src/grpc/loadbalance/client.rs b/examples/src/grpc/loadbalance/client.rs
@@ -2,9 +2,9 @@ use std::{
     cell::RefCell,
     hash::{Hash, Hasher},
     net::IpAddr,
+    sync::LazyLock,
 };
 
-use lazy_static::lazy_static;
 use metainfo::{MetaInfo, METAINFO};
 use pilota::FastStr;
 use volo::{
@@ -15,19 +15,17 @@ use volo::{
     },
 };
 
-lazy_static! {
-    static ref CLIENT: volo_gen::proto_gen::helloworld::GreeterClient = {
-        let discover = StaticDiscover::from(vec![
-            "127.0.0.1:8080".parse().unwrap(),
-            "127.0.0.2:8081".parse().unwrap(),
-        ]);
-        let lb = ConsistentHashBalance::new(ConsistentHashOption::default());
-        volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
-            .load_balance(lb)
-            .discover(discover)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::proto_gen::helloworld::GreeterClient> = LazyLock::new(|| {
+    let discover = StaticDiscover::from(vec![
+        "127.0.0.1:8080".parse().unwrap(),
+        "127.0.0.2:8081".parse().unwrap(),
+    ]);
+    let lb = ConsistentHashBalance::new(ConsistentHashOption::default());
+    volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
+        .load_balance(lb)
+        .discover(discover)
+        .build()
+});
 
 #[inline]
 fn set_request_hash(code: u64) {

diff --git a/examples/src/grpc/multiplex/client.rs b/examples/src/grpc/multiplex/client.rs
@@ -1,22 +1,21 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
-use lazy_static::lazy_static;
 use pilota::FastStr;
 
-lazy_static! {
-    static ref GREETER_CLIENT: volo_gen::proto_gen::helloworld::GreeterClient = {
+static GREETER_CLIENT: LazyLock<volo_gen::proto_gen::helloworld::GreeterClient> =
+    LazyLock::new(|| {
         let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
         volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
             .address(addr)
             .build()
-    };
-    static ref ECHO_CLIENT: volo_gen::proto_gen::echo::EchoClient = {
-        let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
-        volo_gen::proto_gen::echo::EchoClientBuilder::new("echo")
-            .address(addr)
-            .build()
-    };
-}
+    });
+
+static ECHO_CLIENT: LazyLock<volo_gen::proto_gen::echo::EchoClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
+    volo_gen::proto_gen::echo::EchoClientBuilder::new("echo")
+        .address(addr)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/examples/src/grpc/streaming/client.rs b/examples/src/grpc/streaming/client.rs
@@ -1,18 +1,15 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
 use async_stream::stream;
-use lazy_static::lazy_static;
 use pilota::FastStr;
 use tokio_stream::StreamExt;
 
-lazy_static! {
-    static ref CLIENT: volo_gen::proto_gen::streaming::StreamingClient = {
-        let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
-        volo_gen::proto_gen::streaming::StreamingClientBuilder::new("streaming")
-            .address(addr)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::proto_gen::streaming::StreamingClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
+    volo_gen::proto_gen::streaming::StreamingClientBuilder::new("streaming")
+        .address(addr)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/examples/src/thrift/hello/client.rs b/examples/src/thrift/hello/client.rs
@@ -1,16 +1,13 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
-use lazy_static::lazy_static;
 use volo_thrift::client::CallOpt;
 
-lazy_static! {
-    static ref CLIENT: volo_gen::thrift_gen::hello::HelloServiceClient = {
-        let addr: SocketAddr = "127.0.0.1:8081".parse().unwrap();
-        volo_gen::thrift_gen::hello::HelloServiceClientBuilder::new("hello")
-            .address(addr)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::thrift_gen::hello::HelloServiceClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8081".parse().unwrap();
+    volo_gen::thrift_gen::hello::HelloServiceClientBuilder::new("hello")
+        .address(addr)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/examples/src/thrift/multiplex/client.rs b/examples/src/thrift/multiplex/client.rs
@@ -1,17 +1,14 @@
-use std::{future, net::SocketAddr};
+use std::{future, net::SocketAddr, sync::LazyLock};
 
-use lazy_static::lazy_static;
 use volo_thrift::client::CallOpt;
 
-lazy_static! {
-    static ref CLIENT: volo_gen::thrift_gen::hello::HelloServiceClient = {
-        let addr: SocketAddr = "127.0.0.1:8081".parse().unwrap();
-        volo_gen::thrift_gen::hello::HelloServiceClientBuilder::new("hello")
-            .address(addr)
-            .multiplex(true)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::thrift_gen::hello::HelloServiceClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8081".parse().unwrap();
+    volo_gen::thrift_gen::hello::HelloServiceClientBuilder::new("hello")
+        .address(addr)
+        .multiplex(true)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/examples/src/thrift/unknown/client.rs b/examples/src/thrift/unknown/client.rs
@@ -1,16 +1,13 @@
-use std::net::SocketAddr;
+use std::{net::SocketAddr, sync::LazyLock};
 
-use lazy_static::lazy_static;
 use volo_thrift::client::CallOpt;
 
-lazy_static! {
-    static ref CLIENT: volo_gen::thrift_gen::echo::EchoServiceClient = {
-        let addr: SocketAddr = "127.0.0.1:8081".parse().unwrap();
-        volo_gen::thrift_gen::echo::EchoServiceClientBuilder::new("hello")
-            .address(addr)
-            .build()
-    };
-}
+static CLIENT: LazyLock<volo_gen::thrift_gen::echo::EchoServiceClient> = LazyLock::new(|| {
+    let addr: SocketAddr = "127.0.0.1:8081".parse().unwrap();
+    volo_gen::thrift_gen::echo::EchoServiceClientBuilder::new("hello")
+        .address(addr)
+        .build()
+});
 
 #[volo::main]
 async fn main() {

diff --git a/volo-build/Cargo.toml b/volo-build/Cargo.toml
@@ -29,7 +29,6 @@ faststr.workspace = true
 git2.workspace = true
 heck.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 mockall.workspace = true
 mockall_double.workspace = true
 nom.workspace = true

diff --git a/volo-build/src/legacy/util.rs b/volo-build/src/legacy/util.rs
@@ -1,20 +1,20 @@
 use std::{
     fs::{create_dir_all, File, OpenOptions},
     path::{Path, PathBuf},
+    sync::LazyLock,
 };
 
-use lazy_static::lazy_static;
 use serde::de::Error;
 
 use super::model::Config;
 
-lazy_static! {
-    pub static ref DEFAULT_DIR: PathBuf = std::path::Path::new(
+pub static DEFAULT_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
+    std::path::Path::new(
         &std::env::var("OUT_DIR")
-            .expect("OUT_DIR is not set, maybe you are calling volo-build outside build.rs?")
+            .expect("OUT_DIR is not set, maybe you are calling volo-build outside build.rs?"),
     )
-    .join("idl");
-}
+    .join("idl")
+});
 
 pub const DEFAULT_CONFIG_FILE: &str = "volo.yml";