diff --git a/dev/src/uu_nl/nl.rs.html b/dev/src/uu_nl/nl.rs.html
index 479d7db8c..5356c7607 100644
--- a/dev/src/uu_nl/nl.rs.html
+++ b/dev/src/uu_nl/nl.rs.html
@@ -424,6 +424,32 @@
424
425
426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
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.to_string().len();
+ let mut line_no_width = line_no.len();
let line_no_width_initial = line_no_width;
- let mut line_no_threshold = 10i64.pow(line_no_width as u32);
let mut empty_line_count: u64 = 0;
let fill_char = match settings.number_format {
NumberFormat::RightZero => '0',
@@ -757,7 +778,6 @@
if settings.renumber {
line_no = settings.starting_line_number;
line_no_width = line_no_width_initial;
- line_no_threshold = 10i64.pow(line_no_width as u32);
}
&settings.header_numbering
}
@@ -826,11 +846,7 @@
line_no += settings.line_increment;
- while line_no >= line_no_threshold {
- line_no_threshold *= 10;
- line_no_width += 1;
- }
+ line_no_width = line_no.len();
}
Ok(())
}
@@ -850,4 +866,40 @@
fn pass_all(_: &str, _: ®ex::Regex) -> bool {
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);
+
+ assert_eq!(0.len(), 1);
+
+ assert_eq!(1.len(), 1);
+ assert_eq!(10.len(), 2);
+ assert_eq!(100.len(), 3);
+ assert_eq!(1000.len(), 4);
+ }
+}