switch to LazyLock from std

Author: MaxVerevkin

Cargo.lock

@@ -57,7 +57,6 @@ neli-wifi = { version = "0.6", features = ["async"] }
 nix = { version = "0.28", features = ["fs", "process"] }
 nom = "7.1.2"
 notmuch = { version = "0.8", optional = true }
-once_cell = "1"
 pipewire = { version = "0.8", default-features = false, optional = true }
 regex = "1.5"
 reqwest = { version = "0.11", features = ["json"] }

Cargo.toml

@@ -17,6 +17,7 @@ pub use std::borrow::Cow;
 pub use std::collections::HashMap;
 pub use std::fmt::Write;
 pub use std::pin::Pin;
+pub use std::sync::LazyLock as Lazy;
 pub use std::time::Duration;
 
 pub use tokio::io::{AsyncBufRead, AsyncBufReadExt, AsyncReadExt, AsyncWriteExt};
@@ -25,8 +26,6 @@ pub use tokio::time::sleep;
 
 pub use futures::{Stream, StreamExt};
 
-pub use once_cell::sync::Lazy;
-
 pub use smart_default::SmartDefault;
 
 pub use async_trait::async_trait;

src/blocks/prelude.rs

@@ -1,18 +1,18 @@
 use chrono::format::{Fixed, Item, StrftimeItems};
 use chrono::{DateTime, Datelike, Local, LocalResult, Locale, TimeZone, Timelike};
 use chrono_tz::{OffsetName, Tz};
-use once_cell::sync::Lazy;
 
 use std::fmt::Display;
+use std::sync::LazyLock;
 
 use super::*;
 
 make_log_macro!(error, "datetime");
 
 const DEFAULT_DATETIME_FORMAT: &str = "%a %d/%m %R";
 
-pub static DEFAULT_DATETIME_FORMATTER: Lazy<DatetimeFormatter> =
-    Lazy::new(|| DatetimeFormatter::new(Some(DEFAULT_DATETIME_FORMAT), None).unwrap());
+pub static DEFAULT_DATETIME_FORMATTER: LazyLock<DatetimeFormatter> =
+    LazyLock::new(|| DatetimeFormatter::new(Some(DEFAULT_DATETIME_FORMAT), None).unwrap());
 
 #[derive(Debug)]
 pub enum DatetimeFormatter {

src/formatting/formatter/datetime.rs

@@ -28,12 +28,11 @@ pub use tokio;
 use std::borrow::Cow;
 use std::future::Future;
 use std::pin::Pin;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
 use std::time::Duration;
 
 use futures::stream::{FuturesUnordered, StreamExt};
 use futures::Stream;
-use once_cell::sync::Lazy;
 use tokio::process::Command;
 use tokio::sync::{mpsc, Notify};
 
@@ -51,15 +50,15 @@ use crate::widget::{State, Widget};
 const APP_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
 const REQWEST_TIMEOUT: Duration = Duration::from_secs(10);
 
-static REQWEST_CLIENT: Lazy<reqwest::Client> = Lazy::new(|| {
+static REQWEST_CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
     reqwest::Client::builder()
         .user_agent(APP_USER_AGENT)
         .timeout(REQWEST_TIMEOUT)
         .build()
         .unwrap()
 });
 
-static REQWEST_CLIENT_IPV4: Lazy<reqwest::Client> = Lazy::new(|| {
+static REQWEST_CLIENT_IPV4: LazyLock<reqwest::Client> = LazyLock::new(|| {
     reqwest::Client::builder()
         .user_agent(APP_USER_AGENT)
         .local_address(Some(std::net::Ipv4Addr::UNSPECIFIED.into()))

src/lib.rs

@@ -185,7 +185,7 @@ pub use map;
 
 macro_rules! regex {
     ($re:literal $(,)?) => {{
-        static RE: once_cell::sync::OnceCell<regex::Regex> = once_cell::sync::OnceCell::new();
+        static RE: std::sync::OnceLock<regex::Regex> = std::sync::OnceLock::new();
         RE.get_or_init(|| regex::Regex::new($re).unwrap())
     }};
 }