proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-07-27 04:45:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sys: add variable bindings for temporaries in unsafe blocks

Browse Source 
These will produce an error in edition 2024 otherwise. The reason this
is needed is because the `unsafe` block has its own scope.

The bytes were defined inside of the let-mut block to preserve the
lifetime they had before this commit.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2025-03-04 15:40:47 +01:00 committed by Wolfgang Bumiller
parent e06277ac7a
commit 25c08ad247
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proxmox-sys/src/linux/procfs/mod.rs
View File

@ -228,9 +228,10 @@ static PROC_LAST_STAT: LazyLock<RwLock<(ProcFsStat, Instant, bool)>> =
pub fn read_proc_stat() -> Result<ProcFsStat, Error> { pub fn read_proc_stat() -> Result<ProcFsStat, Error> {
let sample_time = Instant::now(); let sample_time = Instant::now();
let update_duration; let update_duration;
let mut stat = let mut stat = {
parse_proc_stat(unsafe { std::str::from_utf8_unchecked(&std::fs::read("/proc/stat")?) }) let bytes = std::fs::read("/proc/stat")?;
.unwrap(); parse_proc_stat(unsafe { std::str::from_utf8_unchecked(&bytes) }).unwrap()
};
{ {
// read lock scope // read lock scope
@ -755,7 +756,8 @@ pub struct Loadavg(pub f64, pub f64, pub f64);
impl Loadavg { impl Loadavg {
/// Read the load avage from `/proc/loadavg`. /// Read the load avage from `/proc/loadavg`.
pub fn read() -> Result<Self, Error> { pub fn read() -> Result<Self, Error> {
Self::parse(unsafe { std::str::from_utf8_unchecked(&std::fs::read("/proc/loadavg")?) }) let bytes = std::fs::read("/proc/loadavg")?;
Self::parse(unsafe { std::str::from_utf8_unchecked(&bytes) })
} }
/// Parse the value triplet. /// Parse the value triplet.