From 3946428df626c545e3cb92d3eeeefe1b604a8eca Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sun, 16 Jun 2024 00:12:54 +0800 Subject: [PATCH] Migrate to the `std` implementation of `OnceCell` --- app/src/main/rust/Cargo.toml | 1 - app/src/main/rust/src/lib.rs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/rust/Cargo.toml b/app/src/main/rust/Cargo.toml index f8f09780c..66c0b7a9a 100644 --- a/app/src/main/rust/Cargo.toml +++ b/app/src/main/rust/Cargo.toml @@ -14,7 +14,6 @@ quick-xml = { default-features = false, version = "0.32" } tl = "0.7" log = "0.4" android_logger = { default-features = false, version = "0.13" } -once_cell = { default-features = false, version = "1.19" } serde_cbor = "0.11" serde = { version = "1.0", features = ["derive"] } anyhow = { version = "1.0" } diff --git a/app/src/main/rust/src/lib.rs b/app/src/main/rust/src/lib.rs index 03934d826..eb2be5e6b 100644 --- a/app/src/main/rust/src/lib.rs +++ b/app/src/main/rust/src/lib.rs @@ -5,7 +5,6 @@ extern crate anyhow; extern crate jni; extern crate jni_fn; extern crate log; -extern crate once_cell; extern crate quick_xml; extern crate regex_lite; extern crate serde; @@ -28,7 +27,7 @@ use tl::{Bytes, Node, NodeHandle, Parser, VDom}; #[macro_export] macro_rules! regex { ($re:literal $(,)?) => {{ - static RE: once_cell::sync::OnceCell = once_cell::sync::OnceCell::new(); + static RE: std::sync::OnceLock = std::sync::OnceLock::new(); RE.get_or_init(|| regex_lite::Regex::new($re).unwrap()) }}; }