feat(deps): remove once_cell

Author: fiji-flo

Cargo.lock

@@ -4,6 +4,7 @@ version = "0.0.1"
 edition = "2021"
 license = "MPL-2.0"
 authors = ["Florian Dieminger <[email protected]>"]
+rust-version = "1.80"
 
 [workspace]
 resolver = "2"
@@ -29,6 +30,7 @@ version = "0.0.1"
 edition = "2021"
 license = "MPL-2.0"
 authors = ["Florian Dieminger <[email protected]>"]
+rust-version = "1.80"
 
 [dependencies]
 anyhow = "1"

Cargo.toml

@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 thiserror = "1"

crates/css-definition-syntax/Cargo.toml

@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 regress = "0.10"

crates/css-syntax-types/Cargo.toml

@@ -4,9 +4,9 @@ version.workspace = true
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
-once_cell = "1"
 thiserror = "1"
 regress = "0.10"
 serde_json = { version = "1", features = ["preserve_order"] }

crates/css-syntax/Cargo.toml

@@ -2,19 +2,19 @@ use std::cmp::{max, min, Ordering};
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fmt::Write;
 use std::fs;
+use std::sync::LazyLock;
 
 use css_definition_syntax::generate::{self, GenerateOptions};
 use css_definition_syntax::parser::{parse, CombinatorType, Multiplier, Node, Type};
 use css_definition_syntax::walk::{walk, WalkOptions};
 use css_syntax_types::{Css, CssValueType, CssValuesItem};
-use once_cell::sync::Lazy;
 #[cfg(all(feature = "rari", not(test)))]
 use rari_types::globals::data_dir;
 use serde::Serialize;
 
 use crate::error::SyntaxError;
 
-static CSS_REF: Lazy<BTreeMap<String, Css>> = Lazy::new(|| {
+static CSS_REF: LazyLock<BTreeMap<String, Css>> = LazyLock::new(|| {
     #[cfg(test)]
     {
         let package_path = std::path::Path::new("package");
@@ -64,7 +64,7 @@ pub struct Flattened {
 // This relies on the ordered names of CSS_REF.
 // "css-values-5" comes after "css-values" and therefore the updated
 // overlapping values in "css-values-5" are ignored.
-static FLATTENED: Lazy<Flattened> = Lazy::new(|| {
+static FLATTENED: LazyLock<Flattened> = LazyLock::new(|| {
     let mut all = Flattened::default();
     let mut entries = CSS_REF.iter().collect::<Vec<_>>();
     entries.sort_by(|a, b| {
@@ -746,7 +746,7 @@ fn get_nodes_for_syntaxes(
 mod test {
     use super::*;
 
-    static TOOLTIPS: Lazy<HashMap<LinkedToken, String>> = Lazy::new(|| {
+    static TOOLTIPS: LazyLock<HashMap<LinkedToken, String>> = LazyLock::new(|| {
         [(LinkedToken::Asterisk, "Asterisk: the entity may occur zero, one or several times".to_string()),
     (LinkedToken::Plus, "Plus: the entity may occur one or several times".to_string()),
     (LinkedToken::QuestionMark, "Question mark: the entity is optional".to_string()),

crates/css-syntax/src/syntax.rs

@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 anyhow = "1"
@@ -18,5 +19,4 @@ ansi-to-html = "0.2"
 itertools = "0.13"
 similar = "2"
 regex = "1"
-once_cell = "1"
 htmldiff = "0.1"

crates/diff-test/Cargo.toml

@@ -4,6 +4,7 @@ use std::fs;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
+use std::sync::LazyLock;
 
 use anyhow::{anyhow, Error};
 use clap::{Args, Parser, Subcommand};
@@ -12,7 +13,6 @@ use ignore::types::TypesBuilder;
 use ignore::WalkBuilder;
 use itertools::Itertools;
 use jsonpath_lib::Compiled;
-use once_cell::sync::Lazy;
 use prettydiff::diff_words;
 use regex::Regex;
 use serde_json::Value;
@@ -174,8 +174,10 @@ const IGNORE: &[&str] = &[
     "doc.other_translations",
 ];
 
-static WS_DIFF: Lazy<Regex> = Lazy::new(|| Regex::new(r#"(?<x>>)[\n ]+|[\n ]+(?<y></)"#).unwrap());
-static DATA_FLAW_SRC: Lazy<Regex> = Lazy::new(|| Regex::new(r#" data-flaw-src="[^"]+""#).unwrap());
+static WS_DIFF: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r#"(?<x>>)[\n ]+|[\n ]+(?<y></)"#).unwrap());
+static DATA_FLAW_SRC: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r#" data-flaw-src="[^"]+""#).unwrap());
 
 fn full_diff(lhs: &Value, rhs: &Value, path: &[PathIndex], diff: &mut BTreeMap<String, String>) {
     if path.len() == 1 {

crates/diff-test/src/main.rs

@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 rari-utils = { path = "../rari-utils" }

crates/rari-data/Cargo.toml

@@ -4,10 +4,10 @@ version.workspace = true
 edition.workspace = true
 authors.workspace = true
 license.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 rari-utils = { path = "../rari-utils" }
-once_cell = "1"
 thiserror = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }