From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ronja.mits.lan by ronja.mits.lan with LMTP id eMCgF57vc2beLgAAxxbTJA (envelope-from ); Thu, 20 Jun 2024 11:00:14 +0200 Received: from proxmox-new.maurer-it.com (unknown [192.168.2.33]) by ronja.mits.lan (Postfix) with ESMTPS id 47570F645D5; Thu, 20 Jun 2024 11:00:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2A89E47D4A; Thu, 20 Jun 2024 11:00:14 +0200 (CEST) Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by proxmox-new.maurer-it.com (Proxmox) with ESMTPS; Thu, 20 Jun 2024 11:00:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F231F122AA; Thu, 20 Jun 2024 11:00:12 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Thu, 20 Jun 2024 11:00:06 +0200 Message-Id: <20240620090008.1823043-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240620090008.1823043-1-m.sandoval@proxmox.com> References: <20240620090008.1823043-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Subject: [pbs-devel] [PATCH backup 2/4] use C-string literals 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" X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods MAILING_LIST_MULTI -2 Multiple indicators imply a widely-seen list manager RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Requires Rust 1.77.0. Signed-off-by: Maximiliano Sandoval --- Cargo.toml | 1 + pbs-client/src/pxar/create.rs | 3 +-- src/api2/node/status.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index abbde299..347b6370 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,7 @@ authors = [ edition = "2021" license = "AGPL-3" repository = "https://git.proxmox.com/?p=proxmox-backup.git" +rust-version = "1.77" [package] name = "proxmox-backup" diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 89a5b5ab..e5a9f75a 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -27,7 +27,6 @@ use pxar::{EntryKind, Metadata, PxarVariant}; use proxmox_human_byte::HumanByte; use proxmox_io::vec; -use proxmox_lang::c_str; use proxmox_sys::fs::{self, acl, xattr}; use pbs_datastore::catalog::BackupCatalogWriter; @@ -496,7 +495,7 @@ impl Archiver { } fn read_pxar_excludes(&mut self, parent: RawFd) -> Result<(), Error> { - let fd = match self.open_file(parent, c_str!(".pxarexclude"), OFlag::O_RDONLY, false)? { + let fd = match self.open_file(parent, c".pxarexclude", OFlag::O_RDONLY, false)? { Some(fd) => fd, None => return Ok(()), }; diff --git a/src/api2/node/status.rs b/src/api2/node/status.rs index 07c20444..78913e4c 100644 --- a/src/api2/node/status.rs +++ b/src/api2/node/status.rs @@ -98,7 +98,7 @@ async fn get_status( uname.machine(), ); - let disk = crate::tools::fs::fs_info_static(proxmox_lang::c_str!("/")).await?; + let disk = crate::tools::fs::fs_info_static(c"/").await?; let boot_info = boot_mode_to_info(boot_mode::BootMode::query(), boot_mode::SecureBoot::query()); -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel