From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AB7701FF161 for ; Tue, 13 Aug 2024 13:02:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 833743FCE5; Tue, 13 Aug 2024 13:02:31 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Tue, 13 Aug 2024 13:02:27 +0200 Message-Id: <20240813110227.329109-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.114 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.rs] Subject: [pbs-devel] [PATCH offline-mirror] 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 --- Cargo.toml | 3 +-- debian/control | 1 - src/config.rs | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 781121f..21e9487 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Proxmox Support Team "] edition = "2021" license = "AGPL-3" description = "Proxmox offline repository mirror and subscription key manager" -rust-version = "1.70" +rust-version = "1.80" exclude = ["debian"] @@ -16,7 +16,6 @@ bzip2 = "0.4" flate2 = "1.0.22" globset = "0.4.8" hex = "0.4.3" -lazy_static = "1.4" nix = "0.26.1" openssl = "0.10" regex = "1.5.5" diff --git a/debian/control b/debian/control index edf88dc..f2353ff 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: bash-completion, librust-flate2-1+default-dev (>= 1.0.22-~~), librust-globset-0.4+default-dev (>= 0.4.8-~~), librust-hex-0.4+default-dev (>= 0.4.3-~~), - librust-lazy-static-1+default-dev (>= 1.4-~~), librust-nix-0.26+default-dev (>= 0.26.1-~~), librust-openssl-0.10+default-dev, librust-proxmox-apt-api-types-dev, diff --git a/src/config.rs b/src/config.rs index 9c75717..eb69a6b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,7 +1,7 @@ use std::path::Path; +use std::sync::LazyLock; use anyhow::{bail, Error}; -use lazy_static::lazy_static; use proxmox_subscription::{sign::ServerBlob, SubscriptionInfo}; use serde::{Deserialize, Serialize}; @@ -261,9 +261,7 @@ impl SubscriptionKey { } } -lazy_static! { - pub static ref CONFIG: SectionConfig = init(); -} +pub static CONFIG: LazyLock = LazyLock::new(init); fn init() -> SectionConfig { let mut config = SectionConfig::new(&MIRROR_ID_SCHEMA); -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel