RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

Add ParseSizeError::PhysicalMem enum variant

Browse source
This commit is contained in:
Jeffrey Finkelstein 2025-01-20 12:35:11 -05:00
parent 6a5f2aa334
commit 39847a741a
6 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/uu/dd/src/parseargs.rs
View file

@ -517,9 +517,7 @@ fn parse_bytes_no_x(full: &str, s: &str) -> Result<u64, ParseError> {
(None, None, None) => match parser.parse_u64(s) {
Ok(n) => (n, 1),
Err(ParseSizeError::SizeTooBig(_)) => (u64::MAX, 1),
Err(ParseSizeError::InvalidSuffix(_) | ParseSizeError::ParseFailure(_)) => {
return Err(ParseError::InvalidNumber(full.to_string()))
}
Err(_) => return Err(ParseError::InvalidNumber(full.to_string())),
},
(Some(i), None, None) => (parse_bytes_only(s, i)?, 1),
(None, Some(i), None) => (parse_bytes_only(s, i)?, 2),

1
src/uu/df/src/df.rs
View file

@ -189,6 +189,7 @@ impl Options {
.to_string(),
),
ParseSizeError::ParseFailure(s) => OptionsError::InvalidBlockSize(s),
ParseSizeError::PhysicalMem(s) => OptionsError::InvalidBlockSize(s),
})?,
header_mode: {
if matches.get_flag(OPT_HUMAN_READABLE_BINARY)

4
src/uu/du/src/du.rs
View file

@ -1120,7 +1120,9 @@ fn format_error_message(error: &ParseSizeError, s: &str, option: &str) -> String
ParseSizeError::InvalidSuffix(_) => {
format!("invalid suffix in --{} argument {}", option, s.quote())
}
ParseSizeError::ParseFailure(_) => format!("invalid --{} argument {}", option, s.quote()),
ParseSizeError::ParseFailure(_) | ParseSizeError::PhysicalMem(_) => {
format!("invalid --{} argument {}", option, s.quote())
}
ParseSizeError::SizeTooBig(_) => format!("--{} argument {} too large", option, s.quote()),
}
}

4
src/uu/od/src/od.rs
View file

@ -626,7 +626,9 @@ fn format_error_message(error: &ParseSizeError, s: &str, option: &str) -> String
ParseSizeError::InvalidSuffix(_) => {
format!("invalid suffix in --{} argument {}", option, s.quote())
}
ParseSizeError::ParseFailure(_) => format!("invalid --{} argument {}", option, s.quote()),
ParseSizeError::ParseFailure(_) | ParseSizeError::PhysicalMem(_) => {
format!("invalid --{} argument {}", option, s.quote())
}
ParseSizeError::SizeTooBig(_) => format!("--{} argument {} too large", option, s.quote()),
}
}

4
src/uu/sort/src/sort.rs
View file

@ -1845,7 +1845,9 @@ fn format_error_message(error: &ParseSizeError, s: &str, option: &str) -> String
ParseSizeError::InvalidSuffix(_) => {
format!("invalid suffix in --{} argument {}", option, s.quote())
}
ParseSizeError::ParseFailure(_) => format!("invalid --{} argument {}", option, s.quote()),
ParseSizeError::ParseFailure(_) | ParseSizeError::PhysicalMem(_) => {
format!("invalid --{} argument {}", option, s.quote())
}
ParseSizeError::SizeTooBig(_) => format!("--{} argument {} too large", option, s.quote()),
}
}

9
src/uucore/src/lib/parser/parse_size.rs
View file

@ -327,6 +327,9 @@ pub enum ParseSizeError {
/// Overflow
SizeTooBig(String),
/// Could not determine total physical memory size.
PhysicalMem(String),
}
impl Error for ParseSizeError {
@ -335,6 +338,7 @@ impl Error for ParseSizeError {
Self::InvalidSuffix(ref s) => s,
Self::ParseFailure(ref s) => s,
Self::SizeTooBig(ref s) => s,
Self::PhysicalMem(ref s) => s,
}
}
}
@ -342,7 +346,10 @@ impl Error for ParseSizeError {
impl fmt::Display for ParseSizeError {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
let s = match self {
Self::InvalidSuffix(s) | Self::ParseFailure(s) | Self::SizeTooBig(s) => s,
Self::InvalidSuffix(s)
| Self::ParseFailure(s)
| Self::SizeTooBig(s)
| Self::PhysicalMem(s) => s,
};
write!(f, "{s}")
}