Anki: Replace lazy_static with once_cell

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

Author: twwn

Cargo.lock

@@ -14,8 +14,8 @@ camino.workspace = true
 dunce.workspace = true
 globset.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 maplit.workspace = true
 num_cpus.workspace = true
+once_cell.workspace = true
 walkdir.workspace = true
 which.workspace = true

build/ninja_gen/Cargo.toml

@@ -5,6 +5,7 @@ use std::collections::HashMap;
 use std::fmt::Display;
 
 use camino::Utf8PathBuf;
+use once_cell::sync::Lazy;
 
 #[derive(Debug, Clone, Hash, Default)]
 pub enum BuildInput {
@@ -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: Lazy<Vec<Utf8PathBuf>> = Lazy::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,7 @@ camino.workspace = true
 clap.workspace = true
 fluent-syntax.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
+once_cell.workspace = true
 regex.workspace = true
 serde_json.workspace = true
 snafu.workspace = true

ftl/Cargo.toml

@@ -14,7 +14,7 @@ use clap::Args;
 use fluent_syntax::ast;
 use fluent_syntax::ast::Resource;
 use fluent_syntax::parser;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use walkdir::DirEntry;
 use walkdir::WalkDir;
@@ -144,9 +144,7 @@ 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: Lazy<Regex> = Lazy::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 +196,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: Lazy<Regex> =
+        Lazy::new(|| Regex::new(r"\Wtr\s*\.([0-9a-z_]+)\W").unwrap());
+    static CAMELCASE_TR: Lazy<Regex> =
+        Lazy::new(|| Regex::new(r"\Wtr2?\.([0-9A-Za-z_]+)\W").unwrap());
+    static DESIGNER_STYLE_TR: Lazy<Regex> =
+        Lazy::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,8 +11,8 @@ rust-version.workspace = true
 anki.workspace = true
 futures.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
 linkcheck.workspace = true
+once_cell.workspace = true
 regex.workspace = true
 reqwest.workspace = true
 strum.workspace = true

rslib/linkchecker/Cargo.toml

@@ -13,7 +13,7 @@ use anki::links::help_page_to_link;
 use anki::links::HelpPage;
 use futures::StreamExt;
 use itertools::Itertools;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use linkcheck::validation::check_web;
 use linkcheck::validation::Context;
 use linkcheck::validation::Reason;
@@ -70,9 +70,10 @@ 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: Lazy<Regex> = Lazy::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

@@ -16,7 +16,7 @@ use itertools::FoldWhile;
 use itertools::FoldWhile::Continue;
 use itertools::FoldWhile::Done;
 use itertools::Itertools;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use rusqlite::ToSql;
 use serde::Deserialize;
 
@@ -110,10 +110,8 @@ fn select_slice_of_size<'a>(
 
 type SequenceNumber = i32;
 
-lazy_static! {
-    static ref HASHMAP: Mutex<HashMap<CollectionId, HashMap<SequenceNumber, DbResponse>>> =
-        Mutex::new(HashMap::new());
-}
+static HASHMAP: Lazy<Mutex<HashMap<CollectionId, HashMap<SequenceNumber, DbResponse>>>> =
+    Lazy::new(|| Mutex::new(HashMap::new()));
 
 pub(crate) fn flush_single_result(col: &Collection, sequence_number: i32) {
     HASHMAP
@@ -244,10 +242,9 @@ pub(crate) fn next_sequence_number() -> i32 {
     SEQUENCE_NUMBER.fetch_add(1, Ordering::SeqCst)
 }
 
-lazy_static! {
-    // same as we get from io.requery.android.database.CursorWindow.sCursorWindowSize
-    static ref DB_COMMAND_PAGE_SIZE: Mutex<usize> = Mutex::new(1024 * 1024 * 2);
-}
+// same as we get from
+// io.requery.android.database.CursorWindow.sCursorWindowSize
+static DB_COMMAND_PAGE_SIZE: Lazy<Mutex<usize>> = Lazy::new(|| Mutex::new(1024 * 1024 * 2));
 
 pub(crate) fn set_max_page_size(size: usize) {
     let mut state = DB_COMMAND_PAGE_SIZE.lock().expect("Could not lock mutex");

rslib/src/ankidroid/db.rs

@@ -1,7 +1,7 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use reqwest::Client;
 use serde;
@@ -31,11 +31,9 @@ pub async fn ankihub_login<S: Into<String>>(
     client: Client,
 ) -> Result<LoginResponse> {
     let client = HttpAnkiHubClient::new("", client);
-    lazy_static! {
-        static ref EMAIL_RE: Regex =
-            Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$")
-                .unwrap();
-    }
+    static EMAIL_RE: Lazy<Regex> = Lazy::new(|| {
+        Regex::new(r"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$").unwrap()
+    });
     let mut request = LoginRequest {
         username: None,
         email: None,

rslib/src/ankihub/login.rs

@@ -9,12 +9,12 @@ use std::fmt::Write;
 use anki_proto::image_occlusion::get_image_occlusion_note_response::ImageOcclusion;
 use anki_proto::image_occlusion::get_image_occlusion_note_response::ImageOcclusionShape;
 use htmlescape::encode_attribute;
-use lazy_static::lazy_static;
 use nom::branch::alt;
 use nom::bytes::complete::tag;
 use nom::bytes::complete::take_while;
 use nom::combinator::map;
 use nom::IResult;
+use once_cell::sync::Lazy;
 use regex::Captures;
 use regex::Regex;
 
@@ -24,16 +24,16 @@ use crate::latex::contains_latex;
 use crate::template::RenderContext;
 use crate::text::strip_html_preserving_entities;
 
-lazy_static! {
-    static ref MATHJAX: Regex = Regex::new(
+static MATHJAX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(
         r"(?xsi)
             (\\[(\[])       # 1 = mathjax opening tag
             (.*?)           # 2 = inner content
             (\\[])])        # 3 = mathjax closing tag
-           "
+           ",
     )
-    .unwrap();
-}
+    .unwrap()
+});
 
 mod mathjax_caps {
     pub const OPENING_TAG: usize = 1;

rslib/src/cloze.rs

@@ -9,7 +9,7 @@ use std::sync::Arc;
 
 use anki_proto::import_export::ExportNoteCsvRequest;
 use itertools::Itertools;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 
 use super::metadata::Delimiter;
@@ -156,23 +156,21 @@ fn field_to_record_field(field: &str, with_html: bool) -> Cow<str> {
 }
 
 fn strip_redundant_sections(text: &str) -> Cow<str> {
-    lazy_static! {
-        static ref RE: Regex = Regex::new(
+    static RE: Lazy<Regex> = Lazy::new(|| {
+        Regex::new(
             r"(?isx)
             <style>.*?</style>          # style elements
             |
             \[\[type:[^]]+\]\]          # type replacements
-            "
+            ",
         )
-        .unwrap();
-    }
+        .unwrap()
+    });
     RE.replace_all(text.as_ref(), "")
 }
 
 fn strip_answer_side_question(text: &str) -> Cow<str> {
-    lazy_static! {
-        static ref RE: Regex = Regex::new(r"(?is)^.*<hr id=answer>\n*").unwrap();
-    }
+    static RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"(?is)^.*<hr id=answer>\n*").unwrap());
     RE.replace_all(text.as_ref(), "")
 }
 

rslib/src/import_export/text/csv/export.rs

@@ -3,34 +3,36 @@
 
 use std::borrow::Cow;
 
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Captures;
 use regex::Regex;
 
 use crate::cloze::expand_clozes_to_reveal_latex;
 use crate::media::files::sha1_of_data;
 use crate::text::strip_html;
 
-lazy_static! {
-    pub(crate) static ref LATEX: Regex = Regex::new(
+pub(crate) static LATEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(
         r"(?xsi)
             \[latex\](.+?)\[/latex\]     # 1 - standard latex
             |
             \[\$\](.+?)\[/\$\]           # 2 - inline math
             |
             \[\$\$\](.+?)\[/\$\$\]       # 3 - math environment
-            "
+            ",
     )
-    .unwrap();
-    static ref LATEX_NEWLINES: Regex = Regex::new(
+    .unwrap()
+});
+static LATEX_NEWLINES: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(
         r#"(?xi)
             <br( /)?>
             |
             <div>
-        "#
+        "#,
     )
-    .unwrap();
-}
+    .unwrap()
+});
 
 pub(crate) fn contains_latex(text: &str) -> bool {
     LATEX.is_match(text)

rslib/src/latex.rs

@@ -53,8 +53,6 @@ pub mod version;
 
 use std::env;
 
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 
-lazy_static! {
-    pub(crate) static ref PYTHON_UNIT_TESTS: bool = env::var("ANKI_TEST_MODE").is_ok();
-}
+pub(crate) static PYTHON_UNIT_TESTS: Lazy<bool> = Lazy::new(|| env::var("ANKI_TEST_MODE").is_ok());