diff --git a/crates/utils/src/os/linux.rs b/crates/utils/src/os/linux.rs index 06c14a867..7d0f48454 100644 --- a/crates/utils/src/os/linux.rs +++ b/crates/utils/src/os/linux.rs @@ -18,30 +18,24 @@ pub fn get_info(p: impl AsRef) -> std::io::Result { let reserved = match bfree.checked_sub(bavail) { Some(reserved) => reserved, None => { - return Err(Error::new( - ErrorKind::Other, - format!( - "detected f_bavail space ({}) > f_bfree space ({}), fs corruption at ({}). please run 'fsck'", - bavail, - bfree, - p.as_ref().display() - ), - )); + return Err(Error::other(format!( + "detected f_bavail space ({}) > f_bfree space ({}), fs corruption at ({}). please run 'fsck'", + bavail, + bfree, + p.as_ref().display() + ))); } }; let total = match blocks.checked_sub(reserved) { Some(total) => total * bsize, None => { - return Err(Error::new( - ErrorKind::Other, - format!( - "detected reserved space ({}) > blocks space ({}), fs corruption at ({}). please run 'fsck'", - reserved, - blocks, - p.as_ref().display() - ), - )); + return Err(Error::other(format!( + "detected reserved space ({}) > blocks space ({}), fs corruption at ({}). please run 'fsck'", + reserved, + blocks, + p.as_ref().display() + ))); } }; @@ -49,15 +43,12 @@ pub fn get_info(p: impl AsRef) -> std::io::Result { let used = match total.checked_sub(free) { Some(used) => used, None => { - return Err(Error::new( - ErrorKind::Other, - format!( - "detected free space ({}) > total drive space ({}), fs corruption at ({}). please run 'fsck'", - free, - total, - p.as_ref().display() - ), - )); + return Err(Error::other(format!( + "detected free space ({}) > total drive space ({}), fs corruption at ({}). please run 'fsck'", + free, + total, + p.as_ref().display() + ))); } }; diff --git a/ecstore/src/utils/os/linux.rs b/ecstore/src/utils/os/linux.rs index e43fc5f7d..1e923727b 100644 --- a/ecstore/src/utils/os/linux.rs +++ b/ecstore/src/utils/os/linux.rs @@ -1,11 +1,10 @@ use nix::sys::stat::{self, stat}; use nix::sys::statfs::{self, FsType, statfs}; use std::fs::File; -use std::io::{self, BufRead, Error, ErrorKind}; +use std::io::{self, BufRead, Error, ErrorKind, Result}; use std::path::Path; use crate::disk::Info; -use std::io::{Error, Result}; use super::IOStats; @@ -163,7 +162,9 @@ fn read_stat(file_name: &str) -> Result> { // 分割行并解析为 u64 // https://rust-lang.github.io/rust-clippy/master/index.html#trim_split_whitespace for token in line.split_whitespace() { - let ui64: u64 = token.parse()?; + let ui64: u64 = token + .parse() + .map_err(|e| Error::new(ErrorKind::InvalidData, format!("Failed to parse token '{}': {}", token, e)))?; stats.push(ui64); } }