Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

refactor(brill): remove `lazy_static` dependency (#2571)

Steve Kurch9cde70cd3f55
diff --git a/Cargo.lock b/Cargo.lock
index 4e6cbb338..149553ba5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2695,7 +2695,6 @@ name = "harper-brill"
version = "1.5.1"
dependencies = [
"harper-pos-utils",
- "lazy_static",
"serde_json",
]
diff --git a/harper-brill/Cargo.toml b/harper-brill/Cargo.toml
index 43c0e081f..4f49bfced 100644
--- a/harper-brill/Cargo.toml
+++ b/harper-brill/Cargo.toml
@@ -8,7 +8,6 @@ repository = "https://github.com/automattic/harper"
[dependencies]
harper-pos-utils = { path = "../harper-pos-utils/", version = "1.0.0" }
-lazy_static = "1.5.0"
serde_json = "1.0.149"
[build-dependencies]
diff --git a/harper-brill/src/lib.rs b/harper-brill/src/lib.rs
index bed130fb7..c0e0ebc6d 100644
--- a/harper-brill/src/lib.rs
+++ b/harper-brill/src/lib.rs
@@ -1,7 +1,6 @@
-use lazy_static::lazy_static;
use std::num::NonZero;
use std::rc::Rc;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
pub use harper_pos_utils::{
BrillChunker, BrillTagger, BurnChunkerCpu, CachedChunker, Chunker, FreqDict, Tagger, UPOS,
@@ -9,9 +8,8 @@ pub use harper_pos_utils::{
const BRILL_TAGGER_SOURCE: &str = include_str!("../trained_tagger_model.json");
-lazy_static! {
- static ref BRILL_TAGGER: Arc<BrillTagger<FreqDict>> = Arc::new(uncached_brill_tagger());
-}
+static BRILL_TAGGER: LazyLock<Arc<BrillTagger<FreqDict>>> =
+ LazyLock::new(|| Arc::new(uncached_brill_tagger()));
fn uncached_brill_tagger() -> BrillTagger<FreqDict> {
serde_json::from_str(BRILL_TAGGER_SOURCE).unwrap()
@@ -25,9 +23,8 @@ pub fn brill_tagger() -> Arc<BrillTagger<FreqDict>> {
const BRILL_CHUNKER_SOURCE: &str = include_str!("../trained_chunker_model.json");
-lazy_static! {
- static ref BRILL_CHUNKER: Arc<BrillChunker> = Arc::new(uncached_brill_chunker());
-}
+static BRILL_CHUNKER: LazyLock<Arc<BrillChunker>> =
+ LazyLock::new(|| Arc::new(uncached_brill_chunker()));
fn uncached_brill_chunker() -> BrillChunker {
serde_json::from_str(BRILL_CHUNKER_SOURCE).unwrap()