RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 20:47:46 +00:00
Code Issues Activity

Merge pull request #3388 from cakebaker/return_unnecessarily_wrapped_by_result

Browse source 
df: remove unnecessary return of Result
This commit is contained in:
Sylvestre Ledru 2022-04-12 22:52:31 +02:00 • committed by GitHub
commit 07be7a0ceb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/uu/df/src/table.rs
View file

@ -216,33 +216,25 @@ impl<'a> DisplayRow<'a> {
/// ///
/// The scaling factor is defined in the `options` field. /// The scaling factor is defined in the `options` field.
/// ///
/// This function is supposed to be used by scaled_bytes() and scaled_inodes() only. /// This function is supposed to be used by `scaled_bytes()` and `scaled_inodes()` only.
/// fn scaled_human_readable(&self, size: u64) -> String {
/// # Errors
///
/// If the scaling factor is not 1000, 1024, or a negative number.
fn scaled_human_readable(&self, size: u64) -> Result<String, fmt::Error> {
let number_prefix = match self.options.block_size { let number_prefix = match self.options.block_size {
BlockSize::HumanReadableDecimal => NumberPrefix::decimal(size as f64), BlockSize::HumanReadableDecimal => NumberPrefix::decimal(size as f64),
BlockSize::HumanReadableBinary => NumberPrefix::binary(size as f64), BlockSize::HumanReadableBinary => NumberPrefix::binary(size as f64),
_ => unreachable!(), _ => unreachable!(),
}; };
match number_prefix { match number_prefix {
NumberPrefix::Standalone(bytes) => Ok(bytes.to_string()), NumberPrefix::Standalone(bytes) => bytes.to_string(),
NumberPrefix::Prefixed(prefix, bytes) => Ok(format!("{:.1}{}", bytes, prefix.symbol())), NumberPrefix::Prefixed(prefix, bytes) => format!("{:.1}{}", bytes, prefix.symbol()),
} }
} }
/// Get a string giving the scaled version of the input number. /// Get a string giving the scaled version of the input number.
/// ///
/// The scaling factor is defined in the `options` field. /// The scaling factor is defined in the `options` field.
/// fn scaled_bytes(&self, size: u64) -> String {
/// # Errors
///
/// If the scaling factor is not 1000, 1024, or a negative number.
fn scaled_bytes(&self, size: u64) -> Result<String, fmt::Error> {
if let BlockSize::Bytes(d) = self.options.block_size { if let BlockSize::Bytes(d) = self.options.block_size {
Ok((size / d).to_string()) (size / d).to_string()
} else { } else {
self.scaled_human_readable(size) self.scaled_human_readable(size)
} }
@ -251,13 +243,9 @@ impl<'a> DisplayRow<'a> {
/// Get a string giving the scaled version of the input number. /// Get a string giving the scaled version of the input number.
/// ///
/// The scaling factor is defined in the `options` field. /// The scaling factor is defined in the `options` field.
/// fn scaled_inodes(&self, size: u64) -> String {
/// # Errors
///
/// If the scaling factor is not 1000, 1024, or a negative number.
fn scaled_inodes(&self, size: u64) -> Result<String, fmt::Error> {
if let BlockSize::Bytes(_) = self.options.block_size { if let BlockSize::Bytes(_) = self.options.block_size {
Ok(size.to_string()) size.to_string()
} else { } else {
self.scaled_human_readable(size) self.scaled_human_readable(size)
} }
@ -279,17 +267,17 @@ impl fmt::Display for DisplayRow<'_> {
for column in &self.options.columns { for column in &self.options.columns {
match column { match column {
Column::Source => write!(f, "{0: <16} ", self.row.fs_device)?, Column::Source => write!(f, "{0: <16} ", self.row.fs_device)?,
Column::Size => write!(f, "{0: >12} ", self.scaled_bytes(self.row.bytes)?)?, Column::Size => write!(f, "{0: >12} ", self.scaled_bytes(self.row.bytes))?,
Column::Used => write!(f, "{0: >12} ", self.scaled_bytes(self.row.bytes_used)?)?, Column::Used => write!(f, "{0: >12} ", self.scaled_bytes(self.row.bytes_used))?,
Column::Avail => write!(f, "{0: >12} ", self.scaled_bytes(self.row.bytes_avail)?)?, Column::Avail => write!(f, "{0: >12} ", self.scaled_bytes(self.row.bytes_avail))?,
Column::Pcent => { Column::Pcent => {
write!(f, "{0: >5} ", DisplayRow::percentage(self.row.bytes_usage))?; write!(f, "{0: >5} ", DisplayRow::percentage(self.row.bytes_usage))?;
} }
Column::Target => write!(f, "{0: <16}", self.row.fs_mount)?, Column::Target => write!(f, "{0: <16}", self.row.fs_mount)?,
Column::Itotal => write!(f, "{0: >12} ", self.scaled_inodes(self.row.inodes)?)?, Column::Itotal => write!(f, "{0: >12} ", self.scaled_inodes(self.row.inodes))?,
Column::Iused => write!(f, "{0: >12} ", self.scaled_inodes(self.row.inodes_used)?)?, Column::Iused => write!(f, "{0: >12} ", self.scaled_inodes(self.row.inodes_used))?,
Column::Iavail => { Column::Iavail => {
write!(f, "{0: >12} ", self.scaled_inodes(self.row.inodes_free)?)?; write!(f, "{0: >12} ", self.scaled_inodes(self.row.inodes_free))?;
} }
Column::Ipcent => { Column::Ipcent => {
write!(f, "{0: >5} ", DisplayRow::percentage(self.row.inodes_usage))?; write!(f, "{0: >5} ", DisplayRow::percentage(self.row.inodes_usage))?;