lazy_static → once_cell → stabilized versions (#3447)

* Anki: Replace lazy_static with once_cell

Unify to once_cell, lazy_static's replacement. The latter in unmaintained.

* Anki: Replace once_cell with stabilized LazyCell / LazyLock as far as possible

Since 1.80: rust-lang/rust#109736 and rust-lang/rust#98165

Non-Thread-Safe Lazy → std::cell::LazyCell https://doc.rust-lang.org/nightly/std/cell/struct.LazyCell.html

Thread-safe SyncLazy → std::sync::LazyLock https://doc.rust-lang.org/nightly/std/sync/struct.LazyLock.html

The compiler accepted LazyCell only in minilints.

The final use in rslib/src/log.rs couldn't be replaced since get_or_try_init has not yet been standardized: rust-lang/rust#109737

* Declare correct MSRV (dae)

Some of our deps require newer Rust versions, so this was misleading.

Updating the MSRV also allows us to use .inspect() on Option now

Author: twwn

Cargo.lock

@@ -3,7 +3,7 @@ version = "0.0.0"
 authors = ["Ankitects Pty Ltd and contributors <https://help.ankiweb.net>"]
 edition = "2021"
 license = "AGPL-3.0-or-later"
-rust-version = "1.65"
+rust-version = "1.80"
 
 [workspace]
 members = [

Cargo.toml

@@ -14,7 +14,6 @@ camino.workspace = true
 dunce.workspace = true
 globset.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 maplit.workspace = true
 num_cpus.workspace = true
 walkdir.workspace = true

build/ninja_gen/Cargo.toml

@@ -3,6 +3,7 @@
 
 use std::collections::HashMap;
 use std::fmt::Display;
+use std::sync::LazyLock;
 
 use camino::Utf8PathBuf;
 
@@ -118,9 +119,7 @@ pub struct Glob {
     pub exclude: Option<String>,
 }
 
-lazy_static::lazy_static! {
-    static ref CACHED_FILES: Vec<Utf8PathBuf> = cache_files();
-}
+static CACHED_FILES: LazyLock<Vec<Utf8PathBuf>> = LazyLock::new(cache_files);
 
 /// Walking the source tree once instead of for each glob yields ~4x speed
 /// improvements.

build/ninja_gen/src/input.rs

@@ -16,7 +16,6 @@ camino.workspace = true
 clap.workspace = true
 fluent-syntax.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 regex.workspace = true
 serde_json.workspace = true
 snafu.workspace = true

ftl/Cargo.toml

@@ -6,6 +6,7 @@ use std::fs;
 use std::io::BufReader;
 use std::iter::FromIterator;
 use std::path::PathBuf;
+use std::sync::LazyLock;
 
 use anki_io::create_file;
 use anyhow::Context;
@@ -14,7 +15,6 @@ use clap::Args;
 use fluent_syntax::ast;
 use fluent_syntax::ast::Resource;
 use fluent_syntax::parser;
-use lazy_static::lazy_static;
 use regex::Regex;
 use walkdir::DirEntry;
 use walkdir::WalkDir;
@@ -144,9 +144,8 @@ fn extract_nested_messages_and_terms(
     ftl_roots: &[impl AsRef<str>],
     used_ftls: &mut HashSet<String>,
 ) {
-    lazy_static! {
-        static ref REFERENCE: Regex = Regex::new(r"\{\s*-?([-0-9a-z]+)\s*\}").unwrap();
-    }
+    static REFERENCE: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"\{\s*-?([-0-9a-z]+)\s*\}").unwrap());
     for_files_with_ending(ftl_roots, ".ftl", |entry| {
         let source = fs::read_to_string(entry.path()).expect("file not readable");
         for caps in REFERENCE.captures_iter(&source) {
@@ -198,11 +197,12 @@ fn entry_use_check(used_ftls: &HashSet<String>) -> impl Fn(&ast::Entry<&str>) ->
 }
 
 fn extract_references_from_file(refs: &mut HashSet<String>, entry: &DirEntry) {
-    lazy_static! {
-        static ref SNAKECASE_TR: Regex = Regex::new(r"\Wtr\s*\.([0-9a-z_]+)\W").unwrap();
-        static ref CAMELCASE_TR: Regex = Regex::new(r"\Wtr2?\.([0-9A-Za-z_]+)\W").unwrap();
-        static ref DESIGNER_STYLE_TR: Regex = Regex::new(r"<string>([0-9a-z_]+)</string>").unwrap();
-    }
+    static SNAKECASE_TR: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"\Wtr\s*\.([0-9a-z_]+)\W").unwrap());
+    static CAMELCASE_TR: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"\Wtr2?\.([0-9A-Za-z_]+)\W").unwrap());
+    static DESIGNER_STYLE_TR: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"<string>([0-9a-z_]+)</string>").unwrap());
 
     let file_name = entry.file_name().to_str().expect("non-unicode filename");
 

ftl/src/garbage_collection.rs

@@ -69,7 +69,6 @@ htmlescape.workspace = true
 hyper.workspace = true
 id_tree.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 nom.workspace = true
 num_cpus.workspace = true
 num_enum.workspace = true

rslib/Cargo.toml

@@ -11,7 +11,6 @@ rust-version.workspace = true
 anki.workspace = true
 futures.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 linkcheck.workspace = true
 regex.workspace = true
 reqwest.workspace = true

rslib/linkchecker/Cargo.toml

@@ -6,14 +6,14 @@
 use std::borrow::Cow;
 use std::env;
 use std::iter;
+use std::sync::LazyLock;
 use std::time::Duration;
 
 use anki::links::help_page_link_suffix;
 use anki::links::help_page_to_link;
 use anki::links::HelpPage;
 use futures::StreamExt;
 use itertools::Itertools;
-use lazy_static::lazy_static;
 use linkcheck::validation::check_web;
 use linkcheck::validation::Context;
 use linkcheck::validation::Reason;
@@ -70,9 +70,8 @@ impl From<&'static str> for CheckableUrl {
 }
 
 fn ts_help_pages() -> impl Iterator<Item = &'static str> {
-    lazy_static! {
-        static ref QUOTED_URL: Regex = Regex::new("\"(http.+)\"").unwrap();
-    }
+    static QUOTED_URL: LazyLock<Regex> = LazyLock::new(|| Regex::new("\"(http.+)\"").unwrap());
+
     QUOTED_URL
         .captures_iter(include_str!("../../../ts/lib/tslib/help-page.ts"))
         .map(|caps| caps.get(1).unwrap().as_str())

rslib/linkchecker/tests/links.rs

@@ -15,7 +15,6 @@ anyhow.workspace = true
 camino.workspace = true
 inflections.workspace = true
 itertools.workspace = true
-once_cell.workspace = true
 prost-reflect.workspace = true
 prost-types.workspace = true
 regex.workspace = true