RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

wc: Update path display

Browse source
This commit is contained in:
Jan Verbeek 2021-08-31 22:02:20 +02:00
parent 3dd6f79880
commit ffe63945b7
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/uu/wc/src/wc.rs
View file

@ -24,6 +24,8 @@ use std::fs::{self, File};
use std::io::{self, Write}; use std::io::{self, Write};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use uucore::display::{Quotable, Quoted};
/// The minimum character width for formatting counts when reading from stdin. /// The minimum character width for formatting counts when reading from stdin.
const MINIMUM_WIDTH: usize = 7; const MINIMUM_WIDTH: usize = 7;
@ -122,10 +124,10 @@ impl Input {
} }
} }
fn path_display(&self) -> std::path::Display<'_> { fn path_display(&self) -> Quoted<'_> {
match self { match self {
Input::Path(path) => path.display(), Input::Path(path) => path.maybe_quote(),
Input::Stdin(_) => Path::display("'standard input'".as_ref()), Input::Stdin(_) => "standard input".maybe_quote(),
} }
} }
} }
@ -448,7 +450,10 @@ fn wc(inputs: Vec<Input>, settings: &Settings) -> Result<(), u32> {
if let Err(err) = print_stats(settings, &result, max_width) { if let Err(err) = print_stats(settings, &result, max_width) {
show_warning!( show_warning!(
"failed to print result for {}: {}", "failed to print result for {}: {}",
result.title.unwrap_or_else(|| "<stdin>".as_ref()).display(), result
.title
.unwrap_or_else(|| "<stdin>".as_ref())
.maybe_quote(),
err err
); );
failure = true; failure = true;
@ -526,7 +531,7 @@ fn print_stats(
} }
if let Some(title) = result.title { if let Some(title) = result.title {
writeln!(stdout_lock, " {}", title.display())?; writeln!(stdout_lock, " {}", title.maybe_quote())?;
} else { } else {
writeln!(stdout_lock)?; writeln!(stdout_lock)?;
} }