Merge branch 'update-lazy-types'

9 files changed, 18 insertions, 25 deletions

diff --git a/test/Cargo.lock b/test/Cargo.lock
index 998176ab5a..66b1924b74 100644
--- a/test/Cargo.lock
+++ b/test/Cargo.lock
@@ -1838,7 +1838,6 @@ dependencies = [
  "log",
  "mullvad-fs",
  "mullvad-types",
- "once_cell",
  "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
@@ -1872,7 +1871,6 @@ dependencies = [
  "mullvad-paths",
  "mullvad-types",
  "nix 0.23.2",
- "once_cell",
  "parity-tokio-ipc",
  "prost",
  "prost-types",
@@ -1905,7 +1903,6 @@ dependencies = [
  "itertools 0.12.1",
  "log",
  "mullvad-types",
- "once_cell",
  "rand 0.8.5",
  "serde_json",
  "talpid-types",
@@ -1921,7 +1918,6 @@ dependencies = [
  "intersection-derive",
  "ipnetwork",
  "log",
- "once_cell",
  "regex",
  "serde",
  "talpid-types",
@@ -3222,7 +3218,6 @@ dependencies = [
  "ipnetwork",
  "jnix",
  "log",
- "once_cell",
  "serde",
  "thiserror",
  "x25519-dalek",
@@ -3349,7 +3344,6 @@ dependencies = [
  "hyper",
  "hyper-rustls",
  "log",
- "once_cell",
  "rustls-pemfile 0.2.1",
  "serde",
  "serde_json",
diff --git a/test/Cargo.toml b/test/Cargo.toml
index 4f8b1931be..d0c734620c 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Mullvad VPN"]
 repository = "https://github.com/mullvad/mullvadvpn-app/"
 license = "GPL-3.0"
 edition = "2021"
-rust-version = "1.77.0"
+rust-version = "1.80.0"
 
 [workspace]
 resolver = "2"
diff --git a/test/test-manager/src/logging.rs b/test/test-manager/src/logging.rs
index 7484c7833d..ce7477cd69 100644
--- a/test/test-manager/src/logging.rs
+++ b/test/test-manager/src/logging.rs
@@ -26,7 +26,7 @@ struct StoredRecord {
 
 impl Logger {
     pub fn get_or_init() -> Self {
-        static LOGGER: once_cell::sync::Lazy<Logger> = once_cell::sync::Lazy::new(|| {
+        static LOGGER: std::sync::LazyLock<Logger> = std::sync::LazyLock::new(|| {
             let mut logger = env_logger::Builder::new();
             logger.filter_module("h2", log::LevelFilter::Info);
             logger.filter_module("tower", log::LevelFilter::Info);
diff --git a/test/test-manager/src/package.rs b/test/test-manager/src/package.rs
index c644d60b72..295557907e 100644
--- a/test/test-manager/src/package.rs
+++ b/test/test-manager/src/package.rs
@@ -1,9 +1,11 @@
 use crate::config::{Architecture, OsType, PackageType, VmConfig};
 use anyhow::{Context, Result};
 use itertools::Itertools;
-use once_cell::sync::Lazy;
 use regex::Regex;
-use std::path::{Path, PathBuf};
+use std::{
+    path::{Path, PathBuf},
+    sync::LazyLock,
+};
 
 #[derive(Debug, Clone)]
 pub struct Manifest {
@@ -70,8 +72,8 @@ pub fn get_app_manifest(
 }
 
 pub fn get_version_from_path(app_package_path: &Path) -> Result<String, anyhow::Error> {
-    static VERSION_REGEX: Lazy<Regex> =
-        Lazy::new(|| Regex::new(r"\d{4}\.\d+((-beta\d+)?(-dev)?-([0-9a-z])+)?").unwrap());
+    static VERSION_REGEX: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"\d{4}\.\d+((-beta\d+)?(-dev)?-([0-9a-z])+)?").unwrap());
 
     VERSION_REGEX
         .captures(app_package_path.to_str().unwrap())
diff --git a/test/test-manager/src/vm/network/linux.rs b/test/test-manager/src/vm/network/linux.rs
index 34e8438b92..f81131119c 100644
--- a/test/test-manager/src/vm/network/linux.rs
+++ b/test/test-manager/src/vm/network/linux.rs
@@ -1,11 +1,11 @@
 use ipnetwork::Ipv4Network;
-use once_cell::sync::Lazy;
 use std::{
     ffi::OsStr,
     io,
     net::{IpAddr, Ipv4Addr},
     process::Stdio,
     str::FromStr,
+    sync::LazyLock,
 };
 use tokio::{
     io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
@@ -13,8 +13,8 @@ use tokio::{
 };
 
 /// (Contained) test subnet for the test runner: 172.29.1.1/24
-pub static TEST_SUBNET: Lazy<Ipv4Network> =
-    Lazy::new(|| Ipv4Network::new(Ipv4Addr::new(172, 29, 1, 1), 24).unwrap());
+pub static TEST_SUBNET: LazyLock<Ipv4Network> =
+    LazyLock::new(|| Ipv4Network::new(Ipv4Addr::new(172, 29, 1, 1), 24).unwrap());
 /// Range of IPs returned by the DNS server: TEST_SUBNET_DHCP_FIRST to TEST_SUBNET_DHCP_LAST
 pub const TEST_SUBNET_DHCP_FIRST: Ipv4Addr = Ipv4Addr::new(172, 29, 1, 2);
 /// Range of IPs returned by the DNS server: TEST_SUBNET_DHCP_FIRST to TEST_SUBNET_DHCP_LAST
diff --git a/test/test-rpc/Cargo.toml b/test/test-rpc/Cargo.toml
index 24596a09af..c39a2a1975 100644
--- a/test/test-rpc/Cargo.toml
+++ b/test/test-rpc/Cargo.toml
@@ -17,7 +17,6 @@ tokio-serde = { workspace = true }
 tarpc = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-once_cell = { workspace = true }
 bytes = { workspace = true }
 thiserror = { workspace = true }
 log = { workspace = true }
diff --git a/test/test-rpc/src/net.rs b/test/test-rpc/src/net.rs
index 124b4f9ad3..c867ccf0d0 100644
--- a/test/test-rpc/src/net.rs
+++ b/test/test-rpc/src/net.rs
@@ -1,15 +1,14 @@
 use futures::channel::oneshot;
 use hyper::{Client, Uri};
-use once_cell::sync::Lazy;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use std::{net::SocketAddr, time::Duration};
+use std::{net::SocketAddr, sync::LazyLock, time::Duration};
 use tokio_rustls::rustls::ClientConfig;
 
 use crate::{AmIMullvad, Error};
 
 const LE_ROOT_CERT: &[u8] = include_bytes!("../../../mullvad-api/le_root_cert.pem");
 
-static CLIENT_CONFIG: Lazy<ClientConfig> = Lazy::new(|| {
+static CLIENT_CONFIG: LazyLock<ClientConfig> = LazyLock::new(|| {
     ClientConfig::builder()
         .with_safe_default_cipher_suites()
         .with_safe_default_kx_groups()
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)
 });