Merge pull request #120 from FalkWoldmann/master

Refactoring and cleanup

Author: alexliesenfeld

Cargo.toml

@@ -9,12 +9,12 @@ keywords = ["http", "mock", "test"]
 categories = ["development-tools::testing"]
 license = "MIT"
 repository = "https://github.com/alexliesenfeld/httpmock"
+rust-version = "1.74.1"
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_regex = "1.1"
-lazy_static = "1.4"
 base64 = "0.22"
 regex = "1.10"
 log = "0.4"
@@ -42,6 +42,7 @@ env_logger = { version = "0.11", optional = true }
 serde_yaml = { version = "0.9", optional = true }
 async-std = { version = "1.12", features = ["attributes", "unstable"] }
 headers = { version = "0.4", optional = true }
+once_cell = "1.20.3"
 
 ### TLS / HTTPS / PROXY
 rustls = { version = "0.23", default-features = false, features = ["std", "tls12"], optional = true }
@@ -54,8 +55,6 @@ futures-timer = "3"
 
 [dev-dependencies]
 env_logger = "0.11"
-tokio-test = "0.4"
-quote = "1.0"
 actix-rt = "2.9"
 colored = "2.1"
 reqwest = { version = "0.12", features = ["blocking", "cookies", "rustls-tls", "rustls-tls-native-roots"] }

src/api/server.rs

@@ -36,7 +36,7 @@ use crate::server::{state::HttpMockStateManager, HttpMockServerBuilder};
 
 use crate::Mock;
 use async_object_pool::Pool;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use std::{
     cell::Cell,
     future::pending,
@@ -1364,31 +1364,33 @@ const LOCAL_SERVER_ADAPTER_GENERATOR: fn() -> Arc<dyn MockServerAdapter + Send +
     Arc::new(LocalMockServerAdapter::new(addr, state_manager))
 };
 
-lazy_static! {
-    static ref LOCAL_SERVER_POOL_REF: Arc<Pool<Arc<dyn MockServerAdapter + Send + Sync>>> = {
+static LOCAL_SERVER_POOL_REF: Lazy<Arc<Pool<Arc<dyn MockServerAdapter + Send + Sync>>>> =
+    Lazy::new(|| {
         let max_servers = read_env("HTTPMOCK_MAX_SERVERS", "25")
             .parse::<usize>()
             .expect("Cannot parse environment variable HTTPMOCK_MAX_SERVERS as an integer");
         Arc::new(Pool::new(max_servers))
-    };
-    static ref REMOTE_SERVER_POOL_REF: Arc<Pool<Arc<dyn MockServerAdapter + Send + Sync>>> =
-        Arc::new(Pool::new(1));
-}
+    });
+
+static REMOTE_SERVER_POOL_REF: Lazy<Arc<Pool<Arc<dyn MockServerAdapter + Send + Sync>>>> =
+    Lazy::new(|| Arc::new(Pool::new(1)));
 
 #[cfg(feature = "remote")]
-lazy_static! {
-    // TODO: REFACTOR to use a runtime agnostic HTTP client for remote access.
-    //  This solution does not require OpenSSL and less dependencies compared to
-    //  other HTTP clients (tested: isahc, surf). Curl seems to use OpenSSL by default,
-    //  so this is not an option. Optimally, the HTTP client uses rustls to avoid the
-    //  dependency on OpenSSL installed on the OS.
-    static ref REMOTE_SERVER_CLIENT: Arc<HttpMockHttpClient> = {
-         let max_workers = read_env("HTTPMOCK_HTTP_CLIENT_WORKER_THREADS", "1")
-            .parse::<usize>()
-            .expect("Cannot parse environment variable HTTPMOCK_HTTP_CLIENT_WORKER_THREADS as an integer");
-         let max_blocking_threads = read_env("HTTPMOCK_HTTP_CLIENT_MAX_BLOCKING_THREADS", "10")
-            .parse::<usize>()
-            .expect("Cannot parse environment variable HTTPMOCK_HTTP_CLIENT_MAX_BLOCKING_THREADS to an integer");
-        Arc::new(HttpMockHttpClient::new(Some(Arc::new(runtime::new(max_workers,max_blocking_threads).unwrap()))))
-    };
-}
+// TODO: REFACTOR to use a runtime agnostic HTTP client for remote access.
+//  This solution does not require OpenSSL and less dependencies compared to
+//  other HTTP clients (tested: isahc, surf). Curl seems to use OpenSSL by default,
+//  so this is not an option. Optimally, the HTTP client uses rustls to avoid the
+//  dependency on OpenSSL installed on the OS.
+static REMOTE_SERVER_CLIENT: Lazy<Arc<HttpMockHttpClient>> = Lazy::new(|| {
+    let max_workers = read_env("HTTPMOCK_HTTP_CLIENT_WORKER_THREADS", "1")
+        .parse::<usize>()
+        .expect(
+            "Cannot parse environment variable HTTPMOCK_HTTP_CLIENT_WORKER_THREADS as an integer",
+        );
+    let max_blocking_threads = read_env("HTTPMOCK_HTTP_CLIENT_MAX_BLOCKING_THREADS", "10")
+        .parse::<usize>()
+        .expect("Cannot parse environment variable HTTPMOCK_HTTP_CLIENT_MAX_BLOCKING_THREADS to an integer");
+    Arc::new(HttpMockHttpClient::new(Some(Arc::new(
+        runtime::new(max_workers, max_blocking_threads).unwrap(),
+    ))))
+});

src/lib.rs

@@ -94,7 +94,6 @@
 //!
 //! This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
 //! warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MIT Public License for more details.
-extern crate lazy_static;
 
 use std::{borrow::BorrowMut, net::ToSocketAddrs};
 

tests/lib.rs

@@ -1,5 +1,3 @@
-extern crate lazy_static;
-
 use httpmock::server::{HttpMockServer, HttpMockServerBuilder};
 use std::{sync::Mutex, thread};
 use tokio::task::LocalSet;