From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 88B8D1FF161 for ; Tue, 13 Aug 2024 10:44:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6073F3DD9E; Tue, 13 Aug 2024 10:44:50 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Tue, 13 Aug 2024 10:44:13 +0200 Message-Id: <20240813084416.177460-8-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813084416.177460-1-m.sandoval@proxmox.com> References: <20240813084416.177460-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.118 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH backup 08/11] datastore: remove lazy_static dependency X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel