WIP Allow specifying glob pattern to ignore config option

Cargo.toml

@@ -57,6 +57,7 @@ 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`

src/config/options.rs

@@ -1,11 +1,11 @@
-use std::collections::HashSet;
+use std::collections::{hash_set, HashSet};
 use std::path::{Path, PathBuf};
 
 use atty;
 
 use crate::config::config_type::ConfigType;
 use crate::config::lists::*;
-use crate::config::{Config, FileName};
+use crate::config::Config;
 
 /// Macro that will stringify the enum variants or a provided textual repr
 #[macro_export]
@@ -398,6 +398,15 @@ impl Default for EmitMode {
 #[derive(Default, Deserialize, Serialize, Clone, Debug, PartialEq)]
 pub struct IgnoreList(HashSet<PathBuf>);
 
+impl<'a> IntoIterator for &'a IgnoreList {
+    type Item = &'a PathBuf;
+    type IntoIter = hash_set::Iter<'a, PathBuf>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.iter()
+    }
+}
+
 impl IgnoreList {
     pub fn add_prefix(&mut self, dir: &Path) {
         self.0 = self
@@ -414,18 +423,6 @@ impl IgnoreList {
             })
             .collect();
     }
-
-    fn skip_file_inner(&self, file: &Path) -> bool {
-        self.0.iter().any(|path| file.starts_with(path))
-    }
-
-    pub fn skip_file(&self, file: &FileName) -> bool {
-        if let FileName::Real(ref path) = file {
-            self.skip_file_inner(path)
-        } else {
-            false
-        }
-    }
 }
 
 impl ::std::str::FromStr for IgnoreList {

src/formatting.rs

@@ -14,6 +14,7 @@ use syntax::source_map::{FilePathMapping, SourceMap, Span};
 
 use crate::comment::{CharClasses, FullCodeCharKind};
 use crate::config::{Config, FileName, Verbosity};
+use crate::ignore::IgnorePathSet;
 use crate::issues::BadIssueSeeker;
 use crate::visitor::{FmtVisitor, SnippetProvider};
 use crate::{modules, source_file, ErrorKind, FormatReport, Input, Session};
@@ -86,10 +87,14 @@ fn format_project<T: FormatHandler>(
     parse_session.span_diagnostic = Handler::with_emitter(true, false, silent_emitter);
 
     let mut context = FormatContext::new(&krate, report, parse_session, config, handler);
+    let ignore_path_set = match IgnorePathSet::from_ignore_list(&config.ignore()) {
+        Ok(set) => set,
+        Err(e) => return Err(ErrorKind::InvalidGlobPattern(e)),
+    };
 
     let files = modules::list_files(&krate, context.parse_session.source_map())?;
     for (path, module) in files {
-        if (config.skip_children() && path != main_file) || config.ignore().skip_file(&path) {
+        if (config.skip_children() && path != main_file) || ignore_path_set.is_match(&path) {
             continue;
         }
         should_emit_verbose(input_is_stdin, config, || println!("Formatting {}", path));
@@ -259,7 +264,10 @@ impl FormattingError {
             | ErrorKind::IoError(_)
             | ErrorKind::ParseError
             | ErrorKind::LostComment => "internal error:",
-            ErrorKind::LicenseCheck | ErrorKind::BadAttr | ErrorKind::VersionMismatch => "error:",
+            ErrorKind::LicenseCheck
+            | ErrorKind::BadAttr
+            | ErrorKind::InvalidGlobPattern(..)
+            | ErrorKind::VersionMismatch => "error:",
             ErrorKind::BadIssue(_) | ErrorKind::DeprecatedAttr => "warning:",
         }
     }

src/ignore.rs

@@ -0,0 +1,26 @@
+use globset::{self, Glob, GlobSet, GlobSetBuilder};
+
+use crate::config::{FileName, IgnoreList};
+
+pub struct IgnorePathSet {
+    ignore_glob_set: GlobSet,
+}
+
+impl IgnorePathSet {
+    pub fn from_ignore_list(ignore_list: &IgnoreList) -> Result<Self, globset::Error> {
+        let mut globset_builder = GlobSetBuilder::new();
+        for ignore_path in ignore_list {
+            globset_builder.add(Glob::new(&ignore_path.to_string_lossy())?);
+        }
+        Ok(IgnorePathSet {
+            ignore_glob_set: globset_builder.build()?,
+        })
+    }
+
+    pub fn is_match(&self, file_name: &FileName) -> bool {
+        match file_name {
+            FileName::Stdin => false,
+            FileName::Real(p) => self.ignore_glob_set.is_match(p),
+        }
+    }
+}

src/lib.rs

@@ -44,6 +44,7 @@ mod comment;
 pub(crate) mod config;
 mod expr;
 pub(crate) mod formatting;
+mod ignore;
 mod imports;
 mod issues;
 mod items;
@@ -108,6 +109,9 @@ pub enum ErrorKind {
     /// If we had formatted the given node, then we would have lost a comment.
     #[fail(display = "not formatted because a comment would be lost")]
     LostComment,
+    /// Invalid glob pattern in `ignore` configuration option.
+    #[fail(display = "Invalid glob pattern found in ignore list: {}", _0)]
+    InvalidGlobPattern(globset::Error),
 }
 
 impl ErrorKind {