Change once_cell::Lazy to std::cell::LazyCell (#105)

yozhgoor · Dec 7, 2024 · 6ff0cf1 · 6ff0cf1
1 parent 82052cc
commit 6ff0cf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,6 @@ serde = { version = "1", features = ["derive"] }
 tempfile = "3.10"
 toml = "0.8"
 regex = "1.10"
-once_cell = "1.19"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

diff --git a/src/dependency.rs b/src/dependency.rs
@@ -1,6 +1,6 @@
 use anyhow::{bail, Result};
-use once_cell::sync::Lazy;
 use regex::Regex;
+use std::sync::LazyLock;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum Dependency {
@@ -19,11 +19,9 @@ pub enum Dependency {
 }
 
 pub fn parse_dependency(s: &str) -> Result<Dependency> {
-    // This will change when `std::lazy` is released.
-    // See https://github.com/rust-lang/rust/issues/74465.
-    static RE: Lazy<Regex> = Lazy::new(|| {
+    static RE: LazyLock<Regex> = LazyLock::new(|| {
         Regex::new(r"^((?P<name>[^+=/]+)=)?(?P<version>((?P<url>\w+://([^:@]+(:[^@]+)?@)?[^#+]*?(?P<url_end>/[^#+/]+)?)(#branch=(?P<branch>[^+]+)|#rev=(?P<rev>[^+]+))?)|[^+]+)?(?P<features>(\+[^+]+)*)$")
-            .unwrap()
+            .expect("dependency's regex must be compiled")
     });
 
     match RE.captures(s) {