diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index cc55032a7..b4649ab91 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -324,9 +324,9 @@ fn show_error(input: &Input, err: io::Error) { /// let input = Input::Stdin(StdinKind::Explicit); /// assert_eq!(7, digit_width(input)); /// ``` -fn digit_width(input: &Input) -> io::Result> { +fn digit_width(input: &Input) -> io::Result { match input { - Input::Stdin(_) => Ok(Some(MINIMUM_WIDTH)), + Input::Stdin(_) => Ok(MINIMUM_WIDTH), Input::Path(filename) => { let path = Path::new(filename); let metadata = fs::metadata(path)?; @@ -337,9 +337,9 @@ fn digit_width(input: &Input) -> io::Result> { // instead). See GitHub issue #2201. let num_bytes = metadata.len(); let num_digits = num_bytes.to_string().len(); - Ok(Some(num_digits)) + Ok(num_digits) } else { - Ok(None) + Ok(MINIMUM_WIDTH) } } } @@ -377,7 +377,7 @@ fn digit_width(input: &Input) -> io::Result> { fn max_width(inputs: &[Input]) -> usize { let mut result = 1; for input in inputs { - if let Ok(Some(n)) = digit_width(input) { + if let Ok(n) = digit_width(input) { result = result.max(n); } } diff --git a/tests/by-util/test_wc.rs b/tests/by-util/test_wc.rs index 2f586fe29..7274c5888 100644 --- a/tests/by-util/test_wc.rs +++ b/tests/by-util/test_wc.rs @@ -213,7 +213,7 @@ fn test_read_from_directory_error() { .args(&["."]) .fails() .stderr_contains(".: Is a directory") - .stdout_is("0 0 0 .\n"); + .stdout_is(" 0 0 0 .\n"); } /// Test that getting counts from nonexistent file is an error.