Merge pull request #271 from klensy/lazy_static

replace lazy_static with std's OnceLock

Author: oli-obk

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Made more code public for miri to use
+* Replaced `lazy_static` with std's `OnceLock`
 
 ### Removed
 

Cargo.lock

@@ -14,7 +14,6 @@ doctest = false # but no doc tests
 [dependencies]
 rustc_version = "0.4"
 colored = "2"
-lazy_static = "1.4.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 cargo_metadata = "0.18"

Cargo.toml

@@ -1,10 +1,10 @@
 //! Datastructures and operations used for normalizing test output.
 
 use bstr::ByteSlice;
-use lazy_static::lazy_static;
 use regex::bytes::{Captures, Regex};
 use std::borrow::Cow;
 use std::path::Path;
+use std::sync::OnceLock;
 
 use crate::display;
 
@@ -25,23 +25,24 @@ impl Match {
             Match::Regex(regex) => regex.replace_all(text, replacement),
             Match::Exact(needle) => text.replace(needle, replacement).into(),
             Match::PathBackslash => {
-                lazy_static! {
-                    static ref PATH_RE: Regex = Regex::new(
-                        r"(?x)
+                static PATH_RE: OnceLock<Regex> = OnceLock::new();
+                PATH_RE
+                    .get_or_init(|| {
+                        Regex::new(
+                            r"(?x)
                         (?:
                             # Match paths to files with extensions that don't include spaces
                             \\(?:[\pL\pN.\-_']+[/\\])*[\pL\pN.\-_']+\.\pL+
                         |
                             # Allow spaces in absolute paths
                             [A-Z]:\\(?:[\pL\pN.\-_'\ ]+[/\\])+
                         )",
-                    )
-                    .unwrap();
-                }
-
-                PATH_RE.replace_all(text, |caps: &Captures<'_>| {
-                    caps[0].replace(r"\", replacement)
-                })
+                        )
+                        .unwrap()
+                    })
+                    .replace_all(text, |caps: &Captures<'_>| {
+                        caps[0].replace(r"\", replacement)
+                    })
             }
         }
     }