Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace OnceCell with static OnceLock for regex compilation #250

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Replace OnceCell with static OnceLock for regex compilation #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions atrium-api/src/types/string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use ipld_core::cid;
use langtag::{LanguageTag, LanguageTagBuf};
use regex::Regex;
use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
use std::{cell::OnceCell, cmp, ops::Deref, str::FromStr};
use std::{cmp, ops::Deref, str::FromStr, sync::OnceLock};

/// Common trait implementations for Lexicon string formats that are newtype wrappers
/// around `String`.
Expand Down Expand Up @@ -213,7 +213,7 @@ impl FromStr for Datetime {
// datetimes to the subset that is also valid under ISO 8601. Apply a regex that
// validates enough of the relevant ISO 8601 format that the RFC 3339 parser can
// do the rest.
const RE_ISO_8601: OnceCell<Regex> = OnceCell::new();
static RE_ISO_8601: OnceLock<Regex> = OnceLock::new();
if RE_ISO_8601
.get_or_init(|| Regex::new(r"^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?(Z|(\+[0-9]{2}|\-[0-9][1-9]):[0-9]{2})$").unwrap())
.is_match(s)
Expand Down Expand Up @@ -267,7 +267,7 @@ impl Did {
#[allow(clippy::borrow_interior_mutable_const, clippy::declare_interior_mutable_const)]
/// Parses a `Did` from the given string.
pub fn new(did: String) -> Result<Self, &'static str> {
const RE_DID: OnceCell<Regex> = OnceCell::new();
static RE_DID: OnceLock<Regex> = OnceLock::new();

// https://atproto.com/specs/did#at-protocol-did-identifier-syntax
if did.len() > 2048 {
Expand Down Expand Up @@ -305,7 +305,7 @@ impl Handle {
#[allow(clippy::borrow_interior_mutable_const, clippy::declare_interior_mutable_const)]
/// Parses a `Handle` from the given string.
pub fn new(handle: String) -> Result<Self, &'static str> {
const RE_HANDLE: OnceCell<Regex> = OnceCell::new();
static RE_HANDLE: OnceLock<Regex> = OnceLock::new();

// https://atproto.com/specs/handle#handle-identifier-syntax
if handle.len() > 253 {
Expand Down Expand Up @@ -338,7 +338,7 @@ impl Nsid {
#[allow(clippy::borrow_interior_mutable_const, clippy::declare_interior_mutable_const)]
/// Parses an NSID from the given string.
pub fn new(nsid: String) -> Result<Self, &'static str> {
const RE_NSID: OnceCell<Regex> = OnceCell::new();
static RE_NSID: OnceLock<Regex> = OnceLock::new();

// https://atproto.com/specs/handle#handle-identifier-syntax
if nsid.len() > 317 {
Expand Down Expand Up @@ -420,7 +420,7 @@ impl Tid {
#[allow(clippy::borrow_interior_mutable_const, clippy::declare_interior_mutable_const)]
/// Parses a `TID` from the given string.
pub fn new(tid: String) -> Result<Self, &'static str> {
const RE_TID: OnceCell<Regex> = OnceCell::new();
static RE_TID: OnceLock<Regex> = OnceLock::new();

if tid.len() != 13 {
Err("TID must be 13 characters")
Expand Down Expand Up @@ -452,7 +452,7 @@ impl RecordKey {
#[allow(clippy::borrow_interior_mutable_const, clippy::declare_interior_mutable_const)]
/// Parses a `Record Key` from the given string.
pub fn new(s: String) -> Result<Self, &'static str> {
const RE_RKEY: OnceCell<Regex> = OnceCell::new();
static RE_RKEY: OnceLock<Regex> = OnceLock::new();

if [".", ".."].contains(&s.as_str()) {
Err("Disallowed rkey")
Expand Down
Loading