From: Maximiliano Sandoval <m.sandoval@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup 2/4] use C-string literals
Date: Thu, 20 Jun 2024 11:00:06 +0200 [thread overview]
Message-ID: <20240620090008.1823043-2-m.sandoval@proxmox.com> (raw)
In-Reply-To: <20240620090008.1823043-1-m.sandoval@proxmox.com>
Requires Rust 1.77.0.
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
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
next prev parent reply other threads:[~2024-06-20 9:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 9:00 [pbs-devel] [PATCH backup 1/4] cargo: use default-features Maximiliano Sandoval
2024-06-20 9:00 ` Maximiliano Sandoval [this message]
2024-06-20 9:00 ` [pbs-devel] [PATCH backup 3/4] datastore: use std::mem::ofset_of! Maximiliano Sandoval
2024-06-20 9:00 ` [pbs-devel] [PATCH backup 4/4] fs: update comment to reflect usage of C-string literals Maximiliano Sandoval
2024-06-20 10:27 ` [pbs-devel] applied-series: [PATCH backup 1/4] cargo: use default-features Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240620090008.1823043-2-m.sandoval@proxmox.com \
--to=m.sandoval@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.