Merge branch 'update-lazy-types'

3 files changed, 10 insertions, 8 deletions

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