diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index ccb7c74eb2b..cc420c627a5 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -2610,24 +2610,29 @@ fn get_block_size(md: &Metadata, config: &Config) -> u64 { md.blocks() * 512 }; + let result = match config.size_format { + SizeFormat::Binary | SizeFormat::Decimal => raw_blocks, + SizeFormat::Bytes => { + (raw_blocks + config.block_size - 1/* ceiling div */) / config.block_size + } + }; + log::debug!( - "md.file_type().is_char_device(): {}, md.file_type().is_block_device(): {},\ - blocks: {}, size: {}, raw: {}, cfg.block_size: {}, cfg.size_format: {:?}", + "is_char_device: {}, is_block_device(): {}, \ + blocks: {}, size: {}, raw: {}, \ + cfg.block_size: {}, result: {}, \ + cfg.size_format: {:?}", md.file_type().is_char_device(), md.file_type().is_block_device(), md.blocks(), md.size(), raw_blocks, config.block_size, + result, config.size_format ); - match config.size_format { - SizeFormat::Binary | SizeFormat::Decimal => raw_blocks, - SizeFormat::Bytes => { - (raw_blocks + config.block_size - 1/* ceiling div */) / config.block_size - } - } + result } #[cfg(not(unix))] { diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs index 4b5acb409e6..3087ca0bc46 100644 --- a/src/uucore/src/lib/lib.rs +++ b/src/uucore/src/lib/lib.rs @@ -19,7 +19,6 @@ mod macros; // crate macros (macro_rules-type; exported to `crate::...`) mod mods; // core cross-platform modules mod parser; // string parsing modules -use log::info; use log::LevelFilter; pub use uucore_procs::*; diff --git a/tests/common/util.rs b/tests/common/util.rs index be5f7d2820a..dcafe9a8d09 100644 --- a/tests/common/util.rs +++ b/tests/common/util.rs @@ -1204,7 +1204,7 @@ impl Drop for LogPrintGuard { std::io::stderr().flush().unwrap(); let mut reader = std::io::BufReader::new(f); - let result = std::io::copy(&mut reader, &mut PrintSink{}).unwrap_or_else(|e| { + let result = std::io::copy(&mut reader, &mut PrintSink {}).unwrap_or_else(|e| { eprintln!( "Failed to read contents of log-file: {}, Err: {:?}", self.log_file.display(),