repalce globset to ignore

Author: rchaser53

Cargo.lock

@@ -57,12 +57,12 @@ bytecount = "0.5"
 unicode-width = "0.1.5"
 unicode_categories = "0.1.1"
 dirs = "1.0.4"
-globset = "0.4"
 
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
 # for more information.
 rustc-workspace-hack = "1.0.0"
+ignore = "0.4.6"
 
 [dev-dependencies]
 lazy_static = "1.0.0"

Cargo.toml

@@ -14,7 +14,7 @@ use syntax::source_map::{FilePathMapping, SourceMap, Span, DUMMY_SP};
 
 use crate::comment::{CharClasses, FullCodeCharKind};
 use crate::config::{Config, FileName, Verbosity};
-use crate::ignore::IgnorePathSet;
+use crate::ignore_path::IgnorePathSet;
 use crate::issues::BadIssueSeeker;
 use crate::utils::{count_newlines, get_skip_macro_names};
 use crate::visitor::{FmtVisitor, SnippetProvider};

src/formatting.rs

@@ -0,0 +1,32 @@
+// use std::path;
+use ignore::{self, gitignore};
+
+use crate::config::{FileName, IgnoreList};
+
+pub struct IgnorePathSet {
+    ignore_set: gitignore::Gitignore,
+}
+
+impl IgnorePathSet {
+    pub fn from_ignore_list(ignore_list: &IgnoreList) -> Result<Self, ignore::Error> {
+        let mut ignore_builder = gitignore::GitignoreBuilder::new("");
+
+        for ignore_path in ignore_list {
+            ignore_builder.add_line(None, ignore_path.to_str().unwrap())?;
+        }
+
+        Ok(IgnorePathSet {
+            ignore_set: ignore_builder.build()?,
+        })
+    }
+
+    pub fn is_match(&self, file_name: &FileName) -> bool {
+        match file_name {
+            FileName::Stdin => false,
+            FileName::Real(p) => !self
+                .ignore_set
+                .matched_path_or_any_parents(p, false)
+                .is_none(),
+        }
+    }
+}

src/ignore.rs

@@ -20,6 +20,7 @@ use std::path::PathBuf;
 use std::rc::Rc;
 
 use failure::Fail;
+use ignore;
 use syntax::{ast, parse::DirectoryOwnership};
 
 use crate::comment::LineClasses;
@@ -46,7 +47,7 @@ mod comment;
 pub(crate) mod config;
 mod expr;
 pub(crate) mod formatting;
-mod ignore;
+mod ignore_path;
 mod imports;
 mod issues;
 mod items;
@@ -113,7 +114,7 @@ pub enum ErrorKind {
     LostComment,
     /// Invalid glob pattern in `ignore` configuration option.
     #[fail(display = "Invalid glob pattern found in ignore list: {}", _0)]
-    InvalidGlobPattern(globset::Error),
+    InvalidGlobPattern(ignore::Error),
 }
 
 impl ErrorKind {