refactor(test_runner): replace lazy_static! with std::sync::LazyLock

r3-os · Nov 20, 2022 · 57184ad · 57184ad
1 parent b6de1c0
commit 57184ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/r3_test_runner/Cargo.toml b/src/r3_test_runner/Cargo.toml
@@ -16,7 +16,6 @@ futures-core = { version = "0.3.5" }
 probe-rs-rtt = { version = "0.12.0" }
 tokio-serial = { version = "5.4.1" }
 async-mutex = { version = "1.4.0" }
-lazy_static = { version = "1.4.0" }
 env_logger = { version = "0.8.4" }
 serde_json = { version = "1.0.57" }
 serialport = { version = "4.0.0" }

diff --git a/src/r3_test_runner/src/main.rs b/src/r3_test_runner/src/main.rs
@@ -3,6 +3,7 @@
 #![feature(must_not_suspend)] // `must_not_suspend` lint
 #![feature(lint_reasons)]
 #![feature(decl_macro)] // `macro`
+#![feature(once_cell)]
 #![feature(pin_macro)] // `core::pin::pin!`
 #![warn(must_not_suspend)]
 use anyhow::{bail, Context};
@@ -98,13 +99,13 @@ struct OptTarget {
 
 impl clap::ValueEnum for OptTarget {
     fn value_variants<'a>() -> &'a [Self] {
-        lazy_static::lazy_static! {
-            static ref VARIANTS: Vec<OptTarget> =
-                targets::TARGETS
-                    .iter()
-                    .map(|&(name, target)| OptTarget { name, target })
-                    .collect();
-        }
+        use std::sync::LazyLock;
+        static VARIANTS: LazyLock<Vec<OptTarget>> = LazyLock::new(|| {
+            targets::TARGETS
+                .iter()
+                .map(|&(name, target)| OptTarget { name, target })
+                .collect()
+        });
 
         &VARIANTS
     }