Use std::sync::LazyLock rather than once_cell.
This was recently stabilised in Rust 1.80.
Test: Treehugger
Change-Id: I33a16bb1ad6c868c5d32ab72d08ce4e7f910300f
diff --git a/libstats/pull_rust/Android.bp b/libstats/pull_rust/Android.bp
index 6902026..2a8939e 100644
--- a/libstats/pull_rust/Android.bp
+++ b/libstats/pull_rust/Android.bp
@@ -61,7 +61,6 @@
srcs: ["stats_pull.rs"],
rustlibs: [
"liblog_rust",
- "libonce_cell",
"libstatslog_rust_header",
"libstatspull_bindgen",
],
diff --git a/libstats/pull_rust/stats_pull.rs b/libstats/pull_rust/stats_pull.rs
index b2bebcc..03929e3 100644
--- a/libstats/pull_rust/stats_pull.rs
+++ b/libstats/pull_rust/stats_pull.rs
@@ -14,13 +14,12 @@
//! A Rust interface for the StatsD pull API.
-use once_cell::sync::Lazy;
use statslog_rust_header::{Atoms, Stat, StatsError};
use statspull_bindgen::*;
use std::collections::HashMap;
use std::convert::TryInto;
use std::os::raw::c_void;
-use std::sync::Mutex;
+use std::sync::{LazyLock, Mutex};
/// The return value of callbacks.
pub type StatsPullResult = Vec<Box<dyn Stat>>;
@@ -107,8 +106,8 @@
}
}
-static COOKIES: Lazy<Mutex<HashMap<i32, fn() -> StatsPullResult>>> =
- Lazy::new(|| Mutex::new(HashMap::new()));
+static COOKIES: LazyLock<Mutex<HashMap<i32, fn() -> StatsPullResult>>> =
+ LazyLock::new(|| Mutex::new(HashMap::new()));
/// # Safety
///