diff --git a/dev/src/uu_nl/nl.rs.html b/dev/src/uu_nl/nl.rs.html
index 5356c7607..7ed5cde8b 100644
--- a/dev/src/uu_nl/nl.rs.html
+++ b/dev/src/uu_nl/nl.rs.html
@@ -433,23 +433,6 @@
433
434
435
-436
-437
-438
-439
-440
-441
-442
-443
-444
-445
-446
-447
-448
-449
-450
-451
-452
use clap::{crate_version, Arg, ArgAction, Command};
use std::fs::File;
use std::io::{stdin, BufRead, BufReader, Read};
-use std::iter::repeat;
use std::path::Path;
use uucore::error::{FromIo, UResult, USimpleError};
use uucore::{format_usage, help_about, help_section, help_usage};
@@ -547,6 +529,19 @@
}
}
+impl NumberFormat {
+ fn format(&self, number: i64, min_width: usize) -> String {
+ match self {
+ Self::Left => format!("{number:<min_width$}"),
+ Self::Right => format!("{number:>min_width$}"),
+ Self::RightZero if number < 0 => format!("-{0:0>1$}", number.abs(), min_width - 1),
+ Self::RightZero => format!("{number:0>min_width$}"),
+ }
+ }
+}
+
pub mod options {
pub const HELP: &str = "help";
pub const FILE: &str = "file";
@@ -715,13 +710,7 @@
fn nl<T: Read>(reader: &mut BufReader<T>, settings: &Settings) -> UResult<()> {
let regexp: regex::Regex = regex::Regex::new(r".?").unwrap();
let mut line_no = settings.starting_line_number;
- let mut line_no_width = line_no.len();
- let line_no_width_initial = line_no_width;
let mut empty_line_count: u64 = 0;
- let fill_char = match settings.number_format {
- NumberFormat::RightZero => '0',
- _ => ' ',
- };
let mut regex_filter = match settings.body_numbering {
NumberingStyle::NumberForRegularExpression(ref re) => re,
@@ -774,10 +763,9 @@
match *match matched_groups {
3 => {
if settings.renumber {
line_no = settings.starting_line_number;
- line_no_width = line_no_width_initial;
}
&settings.header_numbering
}
@@ -827,26 +815,17 @@
// way, start counting empties from zero once more.
empty_line_count = 0;
let w = if settings.number_width > line_no_width {
- settings.number_width - line_no_width
- } else {
- 0
- };
- let fill: String = repeat(fill_char).take(w).collect();
- match settings.number_format {
- NumberFormat::Left => println!(
- "{1}{0}{2}{3}",
- fill, line_no, settings.number_separator, line
- ),
- _ => println!(
- "{0}{1}{2}{3}",
- fill, line_no, settings.number_separator, line
- ),
- }
- println!(
+ "{}{}{}",
+ settings
+ .number_format
+ .format(line_no, settings.number_width),
+ settings.number_separator,
+ line
+ );
+ line_no += settings.line_increment;
- line_no_width = line_no.len();
}
Ok(())
}
@@ -867,39 +846,26 @@
true
}
-trait Length {
- fn len(&self) -> usize;
-}
-
-impl Length for i64 {
- fn len(&self) -> usize {
- if *self == 0 {
- return 1;
- };
-
- let sign_len = if *self < 0 { 1 } else { 0 };
- (0..).take_while(|i| 10i64.pow(*i) <= self.abs()).count() + sign_len
- }
-}
-
#[cfg(test)]
mod test {
use super::*;
#[test]
- fn test_len() {
- assert_eq!((-1).len(), 2);
- assert_eq!((-10).len(), 3);
- assert_eq!((-100).len(), 4);
- assert_eq!((-1000).len(), 5);
+ fn test_format() {
+ assert_eq!(NumberFormat::Left.format(12, 1), "12");
+ assert_eq!(NumberFormat::Left.format(-12, 1), "-12");
+ assert_eq!(NumberFormat::Left.format(12, 4), "12 ");
+ assert_eq!(NumberFormat::Left.format(-12, 4), "-12 ");
- assert_eq!(0.len(), 1);
+ assert_eq!(NumberFormat::Right.format(12, 1), "12");
+ assert_eq!(NumberFormat::Right.format(-12, 1), "-12");
+ assert_eq!(NumberFormat::Right.format(12, 4), " 12");
+ assert_eq!(NumberFormat::Right.format(-12, 4), " -12");
- assert_eq!(1.len(), 1);
- assert_eq!(10.len(), 2);
- assert_eq!(100.len(), 3);
- assert_eq!(1000.len(), 4);
+ assert_eq!(NumberFormat::RightZero.format(12, 1), "12");
+ assert_eq!(NumberFormat::RightZero.format(-12, 1), "-12");
+ assert_eq!(NumberFormat::RightZero.format(12, 4), "0012");
+ assert_eq!(NumberFormat::RightZero.format(-12, 4), "-012");
}
}