From 3b9b8c51cf4a125f03404351d9087aea83d6b57e Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 5 Mar 2025 10:13:30 +0100 Subject: [PATCH] uucore: remove lazy_static & use LazyLock instead --- Cargo.lock | 1 - src/uucore/Cargo.toml | 1 - src/uucore/src/lib/features/checksum.rs | 10 ++++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9586171b32f..40566635957 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3503,7 +3503,6 @@ dependencies = [ "hex", "iana-time-zone", "itertools 0.14.0", - "lazy_static", "libc", "md-5", "memchr", diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index e2633ad969a..0b9f8e643b8 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -31,7 +31,6 @@ dunce = { version = "1.0.4", optional = true } wild = "2.2.1" glob = { workspace = true } iana-time-zone = { workspace = true } -lazy_static = "1.4.0" # * optional itertools = { workspace = true, optional = true } thiserror = { workspace = true, optional = true } diff --git a/src/uucore/src/lib/features/checksum.rs b/src/uucore/src/lib/features/checksum.rs index 9c3be725278..7de10f55b26 100644 --- a/src/uucore/src/lib/features/checksum.rs +++ b/src/uucore/src/lib/features/checksum.rs @@ -5,7 +5,6 @@ // spell-checker:ignore anotherfile invalidchecksum regexes JWZG FFFD xffname prefixfilename bytelen bitlen hexdigit use data_encoding::BASE64; -use lazy_static::lazy_static; use os_display::Quotable; use regex::bytes::{Match, Regex}; use std::{ @@ -16,6 +15,7 @@ use std::{ io::{self, stdin, BufReader, Read, Write}, path::Path, str, + sync::LazyLock, }; use crate::{ @@ -478,11 +478,9 @@ const DOUBLE_SPACE_REGEX: &str = r"^(?P[a-fA-F0-9]+)\s{2}(?P // In this case, we ignore the * const SINGLE_SPACE_REGEX: &str = r"^(?P[a-fA-F0-9]+)\s(?P\*?(?-u:.*))$"; -lazy_static! { - static ref R_ALGO_BASED: Regex = Regex::new(ALGO_BASED_REGEX).unwrap(); - static ref R_DOUBLE_SPACE: Regex = Regex::new(DOUBLE_SPACE_REGEX).unwrap(); - static ref R_SINGLE_SPACE: Regex = Regex::new(SINGLE_SPACE_REGEX).unwrap(); -} +static R_ALGO_BASED: LazyLock = LazyLock::new(|| Regex::new(ALGO_BASED_REGEX).unwrap()); +static R_DOUBLE_SPACE: LazyLock = LazyLock::new(|| Regex::new(DOUBLE_SPACE_REGEX).unwrap()); +static R_SINGLE_SPACE: LazyLock = LazyLock::new(|| Regex::new(SINGLE_SPACE_REGEX).unwrap()); #[derive(Debug, PartialEq, Eq, Clone, Copy)] enum LineFormat {