Replace remaining uses of lazy_static with once_cell

once_cell is the correct way forward, as an API similar to it
is also some day going to be stabilized in the Rust std.

As some regexes were already using once_cell, this migrates
the remaining ones.

Author: paolobarbolini

async-nats/Cargo.toml

@@ -36,7 +36,6 @@ time = { version = "0.3.20", features = ["parsing", "formatting", "serde", "serd
 rustls-native-certs = "0.6.2"
 tracing = "0.1"
 thiserror = "1.0"
-lazy_static = "1.4"
 base64 = "0.13"
 tokio-retry = "0.3"
 ring = "0.16"

async-nats/src/client.rs

@@ -18,7 +18,7 @@ use super::{header::HeaderMap, status::StatusCode, Command, Message, Subscriber}
 use bytes::Bytes;
 use futures::future::TryFutureExt;
 use futures::stream::StreamExt;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use std::fmt::Display;
 use std::sync::atomic::{AtomicU64, Ordering};
@@ -28,9 +28,8 @@ use thiserror::Error;
 use tokio::sync::mpsc;
 use tracing::trace;
 
-lazy_static! {
-    static ref VERSION_RE: Regex = Regex::new(r#"\Av?([0-9]+)\.?([0-9]+)?\.?([0-9]+)?"#).unwrap();
-}
+static VERSION_RE: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r#"\Av?([0-9]+)\.?([0-9]+)?\.?([0-9]+)?"#).unwrap());
 
 /// An error returned from the [`Client::publish`], [`Client::publish_with_headers`],
 /// [`Client::publish_with_reply`] or [`Client::publish_with_reply_and_headers`] functions.

async-nats/src/jetstream/kv/mod.rs

@@ -21,7 +21,7 @@ use std::{
 use crate::{HeaderValue, StatusCode};
 use bytes::Bytes;
 use futures::StreamExt;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use time::{format_description::well_known::Rfc3339, OffsetDateTime};
 
@@ -50,10 +50,8 @@ fn kv_operation_from_maybe_headers(maybe_headers: Option<&String>) -> Operation
 fn kv_operation_from_stream_message(message: &RawMessage) -> Operation {
     kv_operation_from_maybe_headers(message.headers.as_ref())
 }
-lazy_static! {
-    static ref VALID_BUCKET_RE: Regex = Regex::new(r#"\A[a-zA-Z0-9_-]+\z"#).unwrap();
-    static ref VALID_KEY_RE: Regex = Regex::new(r#"\A[-/_=\.a-zA-Z0-9]+\z"#).unwrap();
-}
+static VALID_BUCKET_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\A[a-zA-Z0-9_-]+\z"#).unwrap());
+static VALID_KEY_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\A[-/_=\.a-zA-Z0-9]+\z"#).unwrap());
 
 pub(crate) const MAX_HISTORY: i64 = 64;
 const ALL_KEYS: &str = ">";

async-nats/src/jetstream/object_store/mod.rs

@@ -22,12 +22,12 @@ use std::{
 
 use crate::{HeaderMap, HeaderValue};
 use base64::URL_SAFE;
+use once_cell::sync::Lazy;
 use ring::digest::SHA256;
 use tokio::io::AsyncReadExt;
 
 use base64_url::base64;
 use futures::{Stream, StreamExt};
-use lazy_static::lazy_static;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, trace};
@@ -41,10 +41,8 @@ const DEFAULT_CHUNK_SIZE: usize = 128 * 1024;
 const NATS_ROLLUP: &str = "Nats-Rollup";
 const ROLLUP_SUBJECT: &str = "sub";
 
-lazy_static! {
-    static ref BUCKET_NAME_RE: Regex = Regex::new(r#"\A[a-zA-Z0-9_-]+\z"#).unwrap();
-    static ref OBJECT_NAME_RE: Regex = Regex::new(r#"\A[-/_=\.a-zA-Z0-9]+\z"#).unwrap();
-}
+static BUCKET_NAME_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\A[a-zA-Z0-9_-]+\z"#).unwrap());
+static OBJECT_NAME_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r#"\A[-/_=\.a-zA-Z0-9]+\z"#).unwrap());
 
 pub(crate) fn is_valid_bucket_name(bucket_name: &str) -> bool {
     BUCKET_NAME_RE.is_match(bucket_name)

async-nats/src/service/mod.rs

@@ -27,7 +27,7 @@ use futures::{
     stream::{self, SelectAll},
     Future, Stream, StreamExt,
 };
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
@@ -43,13 +43,14 @@ const QUEUE_GROUP: &str = "q";
 pub const NATS_SERVICE_ERROR: &str = "Nats-Service-Error";
 pub const NATS_SERVICE_ERROR_CODE: &str = "Nats-Service-Error-Code";
 
-lazy_static! {
-    // uses recommended semver validation expression from
-    // https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
-    static ref SEMVER: Regex = Regex::new(r#"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"#).unwrap();
-    // From ADR-33: Name can only have A-Z, a-z, 0-9, dash, underscore.
-    static ref NAME: Regex = Regex::new(r#"^[A-Za-z0-9\-_]+$"#).unwrap();
-}
+// uses recommended semver validation expression from
+// https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+static SEMVER: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r#"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"#)
+        .unwrap()
+});
+// From ADR-33: Name can only have A-Z, a-z, 0-9, dash, underscore.
+static NAME: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^[A-Za-z0-9\-_]+$"#).unwrap());
 
 /// Represents stats for all endpoints.
 #[derive(Debug, Clone, Serialize, Deserialize)]