Eliminate uses of once_cell::sync::Lazy

Author: smoelius

Cargo.lock

@@ -66,7 +66,6 @@ pedantic = { level = "warn", priority = -1 }
 option-if-let-else = "allow"
 missing-errors-doc = "allow"
 missing-panics-doc = "allow"
-non-std-lazy-statics = "allow"
 significant-drop-tightening = "allow"
 struct-field-names = "allow"
 

Cargo.toml

@@ -27,7 +27,6 @@ cargo_metadata = { workspace = true }
 ctor = { workspace = true }
 glob = { workspace = true }
 log = { workspace = true }
-once_cell = { workspace = true }
 predicates = { workspace = true }
 regex = { workspace = true }
 semver = { workspace = true }

cargo-dylint/Cargo.toml

@@ -4,7 +4,6 @@ use anyhow::Result;
 use assert_cmd::Command;
 use cargo_metadata::{Dependency, Metadata, MetadataCommand};
 use dylint_internal::{cargo::current_metadata, env, examples, home};
-use once_cell::sync::Lazy;
 use regex::Regex;
 use semver::{Op, Version};
 use similar_asserts::SimpleDiff;
@@ -15,10 +14,10 @@ use std::{
     fs::{read_dir, read_to_string, write},
     io::{Write as _, stderr},
     path::{Component, Path},
-    sync::Mutex,
+    sync::{LazyLock, Mutex},
 };
 
-static METADATA: Lazy<Metadata> = Lazy::new(|| current_metadata().unwrap());
+static METADATA: LazyLock<Metadata> = LazyLock::new(|| current_metadata().unwrap());
 
 #[ctor::ctor]
 fn initialize() {

cargo-dylint/tests/ci.rs

@@ -8,13 +8,13 @@ use cargo_metadata::MetadataCommand;
 use dylint_internal::{
     CommandExt, driver as dylint_driver, env, parse_path_filename, rustup::SanitizeEnvironment,
 };
-use once_cell::sync::Lazy;
 use std::{
     collections::BTreeMap,
     env::{consts, current_dir},
     ffi::OsStr,
     fs::{OpenOptions, metadata},
     path::{MAIN_SEPARATOR, Path, PathBuf},
+    sync::LazyLock,
 };
 
 type Object = serde_json::Map<String, serde_json::Value>;
@@ -43,7 +43,7 @@ pub mod opts;
 #[cfg(feature = "package_options")]
 mod package_options;
 
-static REQUIRED_FORM: Lazy<String> = Lazy::new(|| {
+static REQUIRED_FORM: LazyLock<String> = LazyLock::new(|| {
     format!(
         r#""{}" LIBRARY_NAME "@" TOOLCHAIN "{}""#,
         consts::DLL_PREFIX,
@@ -527,7 +527,7 @@ mod test {
     // The easiest solution is to just run the tests sequentially.
     static MUTEX: Mutex<()> = Mutex::new(());
 
-    static OPTS: Lazy<opts::Dylint> = Lazy::new(|| opts::Dylint {
+    static OPTS: LazyLock<opts::Dylint> = LazyLock::new(|| opts::Dylint {
         operation: opts::Operation::Check(opts::Check {
             lib_sel: opts::LibrarySelection {
                 manifest_path: Some(String::from("../fixtures/name_toolchain_map/Cargo.toml")),

driver/Cargo.lock

@@ -17,7 +17,7 @@
 //! [struct update syntax]: https://doc.rust-lang.org/book/ch05-01-defining-structs.html#creating-instances-from-other-instances-with-struct-update-syntax
 
 #[cfg(feature = "package_options")]
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Clone, Debug, Default)]
@@ -139,7 +139,7 @@ impl LibrarySelection {
 }
 
 #[cfg(feature = "package_options")]
-static LIBRARY_SELECTION: Lazy<LibrarySelection> = Lazy::new(LibrarySelection::default);
+static LIBRARY_SELECTION: LazyLock<LibrarySelection> = LazyLock::new(LibrarySelection::default);
 
 impl Operation {
     const fn has_library_selection(&self) -> bool {

dylint/src/lib.rs

@@ -1,11 +1,11 @@
 use anyhow::Result;
-use once_cell::sync::Lazy;
+use std::sync::LazyLock;
 use syntect::parsing::{ParseState, ScopeStackOp, SyntaxReference, SyntaxSet};
 
-static SYNTAX_SET: Lazy<SyntaxSet> = Lazy::new(SyntaxSet::load_defaults_nonewlines);
+static SYNTAX_SET: LazyLock<SyntaxSet> = LazyLock::new(SyntaxSet::load_defaults_nonewlines);
 
-static SYNTAX: Lazy<&SyntaxReference> =
-    Lazy::new(|| SYNTAX_SET.find_syntax_by_extension("rs").unwrap());
+static SYNTAX: LazyLock<&SyntaxReference> =
+    LazyLock::new(|| SYNTAX_SET.find_syntax_by_extension("rs").unwrap());
 
 pub fn tokenize_lines<T: AsRef<str>>(lines: &[T]) -> Result<Vec<&str>> {
     let tokens = lines

dylint/src/opts.rs

@@ -125,9 +125,9 @@ impl Iterator for RevIter<'_> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use once_cell::sync::Lazy;
+    use std::sync::LazyLock;
 
-    static EXAMPLES: Lazy<[Rev; 6]> = Lazy::new(|| {
+    static EXAMPLES: LazyLock<[Rev; 6]> = LazyLock::new(|| {
         [
             Rev {
                 version: "0.1.65".to_owned(),