wc: impl AddAssign for CountInfo

Author: fox0

text/wc.rs

@@ -10,9 +10,12 @@
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
 use plib::PROJECT_NAME;
-use std::ffi::OsStr;
-use std::io::{self, Read};
-use std::path::PathBuf;
+use std::{
+    ffi::OsStr,
+    io::{self, Read},
+    ops::AddAssign,
+    path::PathBuf,
+};
 
 /// wc - word, line, and byte or character count
 #[derive(Parser)]
@@ -38,36 +41,30 @@ struct Args {
     files: Vec<PathBuf>,
 }
 
+#[derive(Default)]
 struct CountInfo {
     words: usize,
     chars: usize,
     nl: usize,
 }
 
-impl CountInfo {
-    fn new() -> CountInfo {
-        CountInfo {
-            words: 0,
-            chars: 0,
-            nl: 0,
-        }
-    }
-
-    fn accum(&mut self, count: &CountInfo) {
-        self.words = self.words + count.words;
-        self.chars = self.chars + count.chars;
-        self.nl = self.nl + count.nl;
+impl AddAssign for CountInfo {
+    fn add_assign(&mut self, rhs: Self) {
+        self.words += rhs.words;
+        self.chars += rhs.chars;
+        self.nl += rhs.nl;
     }
 }
 
+/// is_space
 const fn create_table() -> [bool; 256] {
     let mut table = [false; 256];
-    table[9] = true;
-    table[10] = true;
-    table[11] = true;
-    table[12] = true;
-    table[13] = true;
-    table[32] = true;
+    table[b'\t' as usize] = true;
+    table[b'\n' as usize] = true;
+    table[11 /* \v */] = true;
+    table[12 /* \f */] = true;
+    table['\r' as usize] = true;
+    table[' ' as usize] = true;
     table
 }
 
@@ -191,11 +188,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
 
     let mut exit_code = 0;
-    let mut totals = CountInfo::new();
+    let mut totals = CountInfo::default();
 
     // input via stdin
     if args.files.is_empty() {
-        let mut count = CountInfo::new();
+        let mut count = CountInfo::default();
 
         if let Err(e) = wc_file(&args, chars_mode, &PathBuf::new(), &mut count) {
             exit_code = 1;
@@ -205,14 +202,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // input files
     } else {
         for filename in &args.files {
-            let mut count = CountInfo::new();
+            let mut count = CountInfo::default();
 
             if let Err(e) = wc_file(&args, chars_mode, filename, &mut count) {
                 exit_code = 1;
                 eprintln!("{}: {}", filename.display(), e);
             }
 
-            totals.accum(&count);
+            totals += count;
         }
     }