From 0bcb62acb5d9fa8705f6afb69f94c425212977da Mon Sep 17 00:00:00 2001 From: Amit Upadhyay Date: Wed, 20 Nov 2024 15:23:16 +0530 Subject: [PATCH] using std::sync::LazyLock instead of once_cell crate --- Cargo.lock | 1 - fastn-builtins/Cargo.toml | 1 - fastn-builtins/src/constants.rs | 4 ++-- fastn-builtins/src/lib.rs | 7 +++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d89e6eb78..cd5affb475 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1440,7 +1440,6 @@ dependencies = [ "fastn-type", "indexmap", "itertools 0.13.0", - "once_cell", "regex", ] diff --git a/fastn-builtins/Cargo.toml b/fastn-builtins/Cargo.toml index bc381d7593..4a9fcc557a 100644 --- 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 index c05cbccbae..a299c5648c 100644 --- a/fastn-builtins/src/constants.rs +++ b/fastn-builtins/src/constants.rs @@ -1,5 +1,5 @@ -pub static FTD_HIGHLIGHTER: once_cell::sync::Lazy = - once_cell::sync::Lazy::new(|| regex::Regex::new(r"((;;)( *)())( *)(\n?)$").unwrap()); +pub static FTD_HIGHLIGHTER: std::sync::LazyLock = + std::sync::LazyLock::new(|| regex::Regex::new(r"((;;)( *)())( *)(\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 index 4bff364791..8a6371f156 100644 --- 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, -> = once_cell::sync::OnceCell::new(); +pub static DEFAULT_BAG: std::sync::LazyLock> = + std::sync::LazyLock::new(default_bag); pub fn get_default_bag() -> &'static indexmap::IndexMap { - DEFAULT_BAG.get_or_init(default_bag) + &DEFAULT_BAG } pub fn image_function() -> fastn_type::ComponentDefinition {