Skip to content

Commit f85c695

Browse files
authored
Merge pull request #7404 from cakebaker/uucore_remove_lazy_static
uucore: remove `lazy_static` and use `LazyLock` instead
2 parents 0f9b36b + 3b9b8c5 commit f85c695

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/uucore/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dunce = { version = "1.0.4", optional = true }
3131
wild = "2.2.1"
3232
glob = { workspace = true }
3333
iana-time-zone = { workspace = true }
34-
lazy_static = "1.4.0"
3534
# * optional
3635
itertools = { workspace = true, optional = true }
3736
thiserror = { workspace = true, optional = true }

src/uucore/src/lib/features/checksum.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// spell-checker:ignore anotherfile invalidchecksum regexes JWZG FFFD xffname prefixfilename bytelen bitlen hexdigit
66

77
use data_encoding::BASE64;
8-
use lazy_static::lazy_static;
98
use os_display::Quotable;
109
use regex::bytes::{Match, Regex};
1110
use std::{
@@ -16,6 +15,7 @@ use std::{
1615
io::{self, stdin, BufReader, Read, Write},
1716
path::Path,
1817
str,
18+
sync::LazyLock,
1919
};
2020

2121
use crate::{
@@ -478,11 +478,9 @@ const DOUBLE_SPACE_REGEX: &str = r"^(?P<checksum>[a-fA-F0-9]+)\s{2}(?P<filename>
478478
// In this case, we ignore the *
479479
const SINGLE_SPACE_REGEX: &str = r"^(?P<checksum>[a-fA-F0-9]+)\s(?P<filename>\*?(?-u:.*))$";
480480

481-
lazy_static! {
482-
static ref R_ALGO_BASED: Regex = Regex::new(ALGO_BASED_REGEX).unwrap();
483-
static ref R_DOUBLE_SPACE: Regex = Regex::new(DOUBLE_SPACE_REGEX).unwrap();
484-
static ref R_SINGLE_SPACE: Regex = Regex::new(SINGLE_SPACE_REGEX).unwrap();
485-
}
481+
static R_ALGO_BASED: LazyLock<Regex> = LazyLock::new(|| Regex::new(ALGO_BASED_REGEX).unwrap());
482+
static R_DOUBLE_SPACE: LazyLock<Regex> = LazyLock::new(|| Regex::new(DOUBLE_SPACE_REGEX).unwrap());
483+
static R_SINGLE_SPACE: LazyLock<Regex> = LazyLock::new(|| Regex::new(SINGLE_SPACE_REGEX).unwrap());
486484

487485
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
488486
enum LineFormat {

0 commit comments

Comments
 (0)