From a637e7f490a46ecbc52b6a8f7f10cec50b3cf28e Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Tue, 13 Aug 2024 10:44:13 +0200 Subject: [PATCH] datastore: remove lazy_static dependency Signed-off-by: Maximiliano Sandoval --- pbs-datastore/Cargo.toml | 2 +- pbs-datastore/src/datastore.rs | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pbs-datastore/Cargo.toml b/pbs-datastore/Cargo.toml index 494c231b..4ebc5fdc 100644 --- a/pbs-datastore/Cargo.toml +++ b/pbs-datastore/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors.workspace = true edition.workspace = true description = "low level pbs data storage access" +rust-version.workspace = true [dependencies] anyhow.workspace = true @@ -12,7 +13,6 @@ crc32fast.workspace = true endian_trait.workspace = true futures.workspace = true hex = { workspace = true, features = [ "serde" ] } -lazy_static.workspace = true libc.workspace = true log.workspace = true nix.workspace = true diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index d6218fb4..d0f3c53a 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -2,10 +2,9 @@ use std::collections::{HashMap, HashSet}; use std::io::{self, Write}; use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; -use std::sync::{Arc, Mutex}; +use std::sync::{Arc, LazyLock, Mutex}; use anyhow::{bail, format_err, Error}; -use lazy_static::lazy_static; use nix::unistd::{unlinkat, UnlinkatFlags}; use tracing::{info, warn}; @@ -33,10 +32,8 @@ use crate::manifest::ArchiveType; use crate::task_tracking::{self, update_active_operations}; use crate::DataBlob; -lazy_static! { - static ref DATASTORE_MAP: Mutex>> = - Mutex::new(HashMap::new()); -} +static DATASTORE_MAP: LazyLock>>> = + LazyLock::new(|| Mutex::new(HashMap::new())); /// checks if auth_id is owner, or, if owner is a token, if /// auth_id is the user of the token