using std::sync::LazyLock instead of once_cell crate

fastn-stack · Nov 20, 2024 · 0bcb62a · 0bcb62a
1 parent eff1363
commit 0bcb62a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fastn-builtins/Cargo.toml b/fastn-builtins/Cargo.toml
@@ -11,6 +11,5 @@ homepage.workspace = true
 [dependencies]
 regex.workspace = true
 indexmap.workspace = true
-once_cell.workspace = true
 itertools.workspace = true
 fastn-type.workspace = true
diff --git a/fastn-builtins/src/constants.rs b/fastn-builtins/src/constants.rs
@@ -1,5 +1,5 @@
-pub static FTD_HIGHLIGHTER: once_cell::sync::Lazy<regex::Regex> =
-    once_cell::sync::Lazy::new(|| regex::Regex::new(r"((;;)( *)(<hl>))( *)(\n?)$").unwrap());
+pub static FTD_HIGHLIGHTER: std::sync::LazyLock<regex::Regex> =
+    std::sync::LazyLock::new(|| regex::Regex::new(r"((;;)( *)(<hl>))( *)(\n?)$").unwrap());
 
 pub const FTD_BREAKPOINT_WIDTH: &str = "ftd#breakpoint-width";
 pub const FTD_BREAKPOINT_WIDTH_DATA: &str = "ftd#breakpoint-width-data";

diff --git a/fastn-builtins/src/lib.rs b/fastn-builtins/src/lib.rs
@@ -10887,12 +10887,11 @@ pub fn fastn_test_function() -> fastn_type::ComponentDefinition {
     }
 }
 
-pub static DEFAULT_BAG: once_cell::sync::OnceCell<
-    indexmap::IndexMap<String, fastn_type::Definition>,
-> = once_cell::sync::OnceCell::new();
+pub static DEFAULT_BAG: std::sync::LazyLock<indexmap::IndexMap<String, fastn_type::Definition>> =
+    std::sync::LazyLock::new(default_bag);
 
 pub fn get_default_bag() -> &'static indexmap::IndexMap<String, fastn_type::Definition> {
-    DEFAULT_BAG.get_or_init(default_bag)
+    &DEFAULT_BAG
 }
 
 pub fn image_function() -> fastn_type::ComponentDefinition {