Transition to 2018 edition

Cargo.toml

@@ -2,6 +2,7 @@
 name = "hackscanner"
 version = "0.3.0"
 authors = ["Daniel Corn <[email protected]>"]
+edition = "2018"
 
 [lib]
 name = "hackscanner_lib"

src/bin.rs

@@ -132,7 +132,7 @@ fn configure_logging(matches: &ArgMatches) -> Result<(), Error> {
         _ => simplelog::LevelFilter::Warn,
     };
 
-    let mut loggers: Vec<Box<simplelog::SharedLogger>> = vec![];
+    let mut loggers: Vec<Box<dyn simplelog::SharedLogger>> = vec![];
     let mut config = simplelog::Config::default();
     config.time_format = Some("%H:%M:%S%.3f");
 

src/classifier/content_classifier.rs

@@ -1,10 +1,10 @@
-use DirEntryTrait;
+use crate::DirEntryTrait;
 use super::Classification;
 use super::ClassifierTrait;
 use super::Violation;
-use rule::*;
-use matcher::Matcher;
-use errors::Result;
+use crate::rule::*;
+use crate::matcher::Matcher;
+use crate::errors::Result;
 use std::fs::File;
 use std::io::prelude::*;
 use std::path::PathBuf;

src/classifier/mod.rs

@@ -3,8 +3,8 @@ mod classification;
 mod content_classifier;
 mod path_classifier;
 
-use dir_entry::*;
-use rule::*;
+use crate::dir_entry::*;
+use crate::rule::*;
 
 pub use self::violation::Violation;
 use self::classification::*;
@@ -100,9 +100,9 @@ fn panic_empty() -> ! {
 #[cfg(test)]
 mod test {
     use super::*;
-    use severity::Severity;
+    use crate::severity::Severity;
     use std::convert::TryInto;
-    use fs::StandaloneFileType;
+    use crate::fs::StandaloneFileType;
 
     fn test_classify_entry<D: DirEntryTrait>(entry: &D, rule: &Rule) -> Classification {
         let mut path_classifier = path_classifier::PathClassifier::new(entry);

src/classifier/path_classifier.rs

@@ -1,9 +1,9 @@
-use rule::*;
+use crate::rule::*;
 use super::Classification;
 use super::ClassifierTrait;
 use super::Violation;
-use DirEntryTrait;
-use matcher::Matcher;
+use crate::DirEntryTrait;
+use crate::matcher::Matcher;
 
 pub struct PathClassifier {}
 

src/classifier/violation.rs

@@ -1,6 +1,6 @@
-use ::{Rule, Severity};
+use crate::{Rule, Severity};
 use std::error::Error as StdError;
-use PatternRule;
+use crate::PatternRule;
 
 #[derive(Debug, Clone)]
 pub struct Violation {
@@ -39,14 +39,14 @@ impl Violation {
     }
 }
 
-impl From<&StdError> for Violation {
-    fn from(error: &StdError) -> Self {
+impl From<&dyn StdError> for Violation {
+    fn from(error: &dyn StdError) -> Self {
         Self::with_name_and_severity(error.description().to_owned(), Severity::NOTICE)
     }
 }
 
-impl From<&::errors::Error> for Violation {
-    fn from(error: &::errors::Error) -> Self {
+impl From<&crate::errors::Error> for Violation {
+    fn from(error: &crate::errors::Error) -> Self {
         Self::with_name_and_severity(error.description().to_owned(), Severity::NOTICE)
     }
 }

src/dir_entry/mod.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use std::ffi::OsStr;
 use std::io;
 use std::fmt::Debug;
-use fs::FileTypeTrait;
+use crate::fs::FileTypeTrait;
 
 pub trait DirEntryTrait: Debug {
     /// The full path that this entry represents.
@@ -25,7 +25,7 @@ pub trait DirEntryTrait: Debug {
     /// Return the file type for the file that this entry points to.
     ///
     /// See [`walkdir::DirEntry::file_type`] for more details
-    fn file_type(&self) -> Box<FileTypeTrait>;
+    fn file_type(&self) -> Box<dyn FileTypeTrait>;
 
     /// Return the file name of this entry.
     ///

src/dir_entry/standalone.rs

@@ -3,8 +3,8 @@ use std::io;
 use std::path::Path;
 use std::path::PathBuf;
 use std::fs;
-use fs::FileTypeTrait;
-use fs::StandaloneFileType;
+use crate::fs::FileTypeTrait;
+use crate::fs::StandaloneFileType;
 use super::DirEntryTrait;
 
 #[derive(Debug, Clone)]
@@ -56,7 +56,7 @@ impl DirEntryTrait for DirEntry {
     /// Return the file type for the file that this entry points to.
     ///
     /// See [`walkdir::DirEntry::file_type`] for more details
-    fn file_type(&self) -> Box<FileTypeTrait> {
+    fn file_type(&self) -> Box<dyn FileTypeTrait> {
         Box::new(self.file_type.clone())
     }
 

src/dir_entry/walkdir.rs

@@ -3,7 +3,7 @@ use std::io;
 use std::path::Path;
 use std::ffi::OsStr;
 use walkdir;
-use fs::FileTypeTrait;
+use crate::fs::FileTypeTrait;
 use super::DirEntryTrait;
 
 #[derive(Debug, Clone)]
@@ -59,7 +59,7 @@ impl DirEntryTrait for DirEntry {
     /// Return the file type for the file that this entry points to.
     ///
     /// See [`walkdir::DirEntry::file_type`] for more details
-    fn file_type(&self) -> Box<FileTypeTrait> {
+    fn file_type(&self) -> Box<dyn FileTypeTrait> {
         Box::new(self.raw.file_type())
     }
 

src/file_finder/ftw/mod.rs

@@ -10,11 +10,11 @@ use std::fmt::Debug;
 use std::vec::Vec;
 use std::cell::RefCell;
 
-use fs::constants::*;
+use crate::fs::constants::*;
 
 use super::FileFinderTrait;
-use dir_entry::StandaloneDirEntry;
-use fs::StandaloneFileType;
+use crate::dir_entry::StandaloneDirEntry;
+use crate::fs::StandaloneFileType;
 
 #[repr(C)]
 struct FTW {

src/file_finder/mod.rs

@@ -6,10 +6,10 @@ pub mod ftw;
 pub mod fts;
 pub mod walkdir;
 
-use rule::*;
-use dir_entry::*;
-use matcher::Matcher;
-use Severity;
+use crate::rule::*;
+use crate::dir_entry::*;
+use crate::matcher::Matcher;
+use crate::Severity;
 
 pub trait FileFinderTrait {
     type DirEntry: DirEntryTrait;

src/file_finder/walkdir.rs

@@ -1,4 +1,4 @@
-use dir_entry::WalkdirDirEntry;
+use crate::dir_entry::WalkdirDirEntry;
 use std::fmt::Debug;
 use std::path::Path;
 use super::FileFinderTrait;

src/join.rs

@@ -1,4 +1,4 @@
-use classifier::Violation;
+use crate::classifier::Violation;
 
 pub fn join_violations(violations: &Vec<Violation>) -> String {
     violations.iter().map(|v| v.name().to_owned()).collect::<Vec<String>>().join(", ")

src/lib.rs

@@ -30,10 +30,10 @@ pub mod rating;
 pub mod file_finder;
 pub mod classifier;
 
-pub use errors::*;
-pub use dir_entry::*;
-pub use rule::*;
-pub use rating::*;
-pub use file_finder::find_files;
-pub use severity::Severity;
-pub use join::join_violations;
+pub use crate::errors::*;
+pub use crate::dir_entry::*;
+pub use crate::rule::*;
+pub use crate::rating::*;
+pub use crate::file_finder::find_files;
+pub use crate::severity::Severity;
+pub use crate::join::join_violations;

src/matcher.rs

@@ -1,6 +1,6 @@
-use rule::RuleTrait;
-use rule::PatternRule;
-use dir_entry::*;
+use crate::rule::RuleTrait;
+use crate::rule::PatternRule;
+use crate::dir_entry::*;
 
 pub struct Matcher {}