From 6afb26b3777c7545f6772b692fc594d00976466e Mon Sep 17 00:00:00 2001 From: overtrue Date: Tue, 10 Jun 2025 22:02:29 +0800 Subject: [PATCH] fix: resolve duplicate Error import and ParseIntError conversion in linux.rs --- ecstore/src/utils/os/linux.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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); } }