summaryrefslogtreecommitdiffhomepage
path: root/test/test-runner/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-07-29 11:46:18 +0200
committerDavid Lönnhager <david.l@mullvad.net>2024-08-27 10:23:29 +0200
commit95ebffa3f13903146ca1c1a0c0345e5ebf1b461b (patch)
tree36ad78830a4682e367e0881f713d233974906569 /test/test-runner/src
parent3388f5d5591c7bd704ab06839a651b5c46802425 (diff)
downloadmullvadvpn-95ebffa3f13903146ca1c1a0c0345e5ebf1b461b.tar.xz
mullvadvpn-95ebffa3f13903146ca1c1a0c0345e5ebf1b461b.zip
Use std LazyLock instead of once_cell Lazy
Diffstat (limited to 'test/test-runner/src')
-rw-r--r--test/test-runner/src/forward.rs7
-rw-r--r--test/test-runner/src/logging.rs4
2 files changed, 5 insertions, 6 deletions
diff --git a/test/test-runner/src/forward.rs b/test/test-runner/src/forward.rs
index a4c80ae189..01b48e647a 100644
--- a/test/test-runner/src/forward.rs
+++ b/test/test-runner/src/forward.rs
@@ -1,17 +1,16 @@
-use once_cell::sync::Lazy;
use std::{
collections::HashMap,
net::SocketAddr,
sync::{
atomic::{AtomicUsize, Ordering},
- Arc, Mutex,
+ Arc, LazyLock, Mutex,
},
};
use test_rpc::net::SockHandleId;
use tokio::net::{TcpListener, TcpStream};
-static SERVERS: Lazy<Mutex<HashMap<SockHandleId, Handle>>> =
- Lazy::new(|| Mutex::new(HashMap::new()));
+static SERVERS: LazyLock<Mutex<HashMap<SockHandleId, Handle>>> =
+ LazyLock::new(|| Mutex::new(HashMap::new()));
/// Spawn a TCP forwarder that sends TCP via `via_addr`
pub async fn start_server(
diff --git a/test/test-runner/src/logging.rs b/test/test-runner/src/logging.rs
index ffe21de985..2fb8939002 100644
--- a/test/test-runner/src/logging.rs
+++ b/test/test-runner/src/logging.rs
@@ -1,8 +1,8 @@
use log::{Level, LevelFilter, Metadata, Record, SetLoggerError};
-use once_cell::sync::Lazy;
use std::{
ffi::OsStr,
path::{Path, PathBuf},
+ sync::LazyLock,
};
use test_rpc::logging::{Error, LogFile, LogOutput, Output};
use tokio::{
@@ -22,7 +22,7 @@ const EXCLUDE_LOG_FILE_CONTAIN: &str = ".old";
/// Maximum number of lines that each log file may contain
const TRUNCATE_LOG_FILE_LINES: usize = 100;
-pub static LOGGER: Lazy<StdOutBuffer> = Lazy::new(|| {
+pub static LOGGER: LazyLock<StdOutBuffer> = LazyLock::new(|| {
let (sender, listener) = channel(MAX_OUTPUT_BUFFER);
StdOutBuffer(Mutex::new(listener), sender)
});