proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-03 03:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sys: get rid of a try_block

Browse Source 
by skipping over a utf8 scheck (serde_json can take a byte slice
already via `from_slice()`)

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2024-08-07 14:45:13 +02:00
parent b266779ec0
commit 83c5ced7a9
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
proxmox-sys/src/fs/file.rs
View File

@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
#[cfg(feature = "timer")] #[cfg(feature = "timer")]
use std::time::Duration; use std::time::Duration;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Context as _, Error};
use nix::errno::Errno; use nix::errno::Errno;
use nix::fcntl::OFlag; use nix::fcntl::OFlag;
use nix::sys::stat; use nix::sys::stat;
@ -13,8 +13,6 @@ use nix::unistd;
use nix::NixPath; use nix::NixPath;
use serde_json::Value; use serde_json::Value;
use proxmox_lang::try_block;
use crate::error::SysError; use crate::error::SysError;
#[cfg(feature = "timer")] #[cfg(feature = "timer")]
@ -86,8 +84,9 @@ pub fn file_read_optional_string<P: AsRef<Path>>(path: P) -> Result<Option<Strin
pub fn file_get_json<P: AsRef<Path>>(path: P, default: Option<Value>) -> Result<Value, Error> { pub fn file_get_json<P: AsRef<Path>>(path: P, default: Option<Value>) -> Result<Value, Error> {
let path = path.as_ref(); let path = path.as_ref();
let raw = match std::fs::read(path) { match std::fs::read(path) {
Ok(v) => v, Ok(data) => serde_json::from_slice(&data)
.with_context(|| format!("unable to parse json from {path:?}")),
Err(err) => { Err(err) => {
if err.kind() == std::io::ErrorKind::NotFound { if err.kind() == std::io::ErrorKind::NotFound {
if let Some(v) = default { if let Some(v) = default {
@ -96,14 +95,7 @@ pub fn file_get_json<P: AsRef<Path>>(path: P, default: Option<Value>) -> Result<
} }
bail!("unable to read json {:?} - {}", path, err); bail!("unable to read json {:?} - {}", path, err);
} }
}; }
try_block!({
let data = String::from_utf8(raw)?;
let json = serde_json::from_str(&data)?;
Ok(json)
})
.map_err(|err: Error| format_err!("unable to parse json from {:?} - {}", path, err))
} }
/// Read the first line of a file as String in std IO error context /// Read the first line of a file as String in std IO error context