fix: Cleanup eprintln calls by changing to trace! calls. Fix clippy w…

…arnings

src/comments/mod.rs

@@ -26,7 +26,7 @@ pub trait Comment {
 mod tests {
     use super::*;
 
-    const EX_TEXT: &'static str = "There once was a man
+    const EX_TEXT: &str = "There once was a man
 with a very nice cat
 the cat wore a top hat
 it looked super dapper

src/config/comment.rs

@@ -23,10 +23,7 @@ fn def_trailing_lines() -> usize {
 
 pub fn get_filetype(filename: &str) -> &str {
     let iter = filename.split('.');
-    match iter.last() {
-        Some(s) => s,
-        None => "",
-    }
+    iter.last().unwrap_or_default()
 }
 
 #[derive(Clone, Deserialize, Debug)]

src/licensure.rs

@@ -55,6 +55,8 @@ impl Licensure {
                 continue;
             }
 
+            trace!("Working on file: {}", &file);
+
             let mut content = String::new();
             {
                 let mut f = File::open(file)?;
@@ -106,14 +108,16 @@ impl Licensure {
         header: &str,
     ) -> Option<String> {
         let outdated_re = templ.outdated_license_pattern(commenter);
-        println!("{}", content);
-        println!("{:?}", outdated_re);
+        // trace!("Content: {}", content);
+        // trace!("Outdated Regex: {:?}", outdated_re);
+        // trace!("Header: {:?}", header);
         if outdated_re.is_match(content) {
             return Some(outdated_re.replace(content, header).to_string());
         }
 
         // Account for possible whitespace changes
         let trimmed_outdated_re = templ.outdated_license_trimmed_pattern(commenter);
+        // trace!("trimmed_outdated_re Regex: {:?}", trimmed_outdated_re);
         if trimmed_outdated_re.is_match(content) {
             Some(trimmed_outdated_re.replace(content, header).to_string())
         } else {

src/main.rs

@@ -132,7 +132,9 @@ More information is available at: {}",
     match matches.occurrences_of("verbose") {
         0 => (),
         x => simplelog::SimpleLogger::init(
-            if x > 2 {
+            if x > 3 {
+                simplelog::LevelFilter::Trace
+            } else if x > 2 {
                 simplelog::LevelFilter::Debug
             } else {
                 simplelog::LevelFilter::Info
@@ -233,6 +235,6 @@ mod test {
 
     #[test]
     fn test_get_project_files() {
-        assert!(get_project_files().len() != 0)
+        assert!(!get_project_files().is_empty())
     }
 }

src/template.rs

@@ -329,7 +329,7 @@ mod tests {
         );
         let commenter: Box<dyn Comment> = Box::new(LineComment::new("#", Option::Some(1000)));
         let re = template.outdated_license_pattern(commenter.as_ref());
-        assert_eq!(true, re.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software.\n"))
+        assert!(re.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software.\n"))
     }
 
     #[test]
@@ -351,11 +351,11 @@ mod tests {
         let commenter: Box<dyn Comment> =
             Box::new(LineComment::new("#", Option::Some(1000)).set_trailing_lines(2));
         let re = template.outdated_license_pattern(commenter.as_ref());
-        assert_eq!(true, re.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software.\n\n\n"));
-        assert_eq!(false, re.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software."));
+        assert!(re.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software.\n\n\n"));
+        assert!(!re.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software."));
 
         let trimmed = template.outdated_license_trimmed_pattern(commenter.as_ref());
-        assert_eq!(true, trimmed.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software."))
+        assert!(trimmed.is_match("# Copyright (C) 2020 Mathew Robinson <[email protected]> This program is free software."))
     }
 
     #[test]

src/utils/mod.rs

@@ -39,6 +39,6 @@ So is this.";
 
         let expected = "some wrapped text to unwrap.\n\nThe line above \
         is an intentional line break.\n\nSo is this.";
-        assert_eq!(expected, remove_column_wrapping(&content))
+        assert_eq!(expected, remove_column_wrapping(content))
     }
 }