Add better error messages for invalid globs.

This threads the original glob given by end users through all of the
glob parsing errors. This was slightly trickier than it might appear
because the gitignore implementation actually modifies the glob before
compiling it. So in order to get better glob error messages everywhere,
we need to track the original glob both in the glob parser and in the
higher-level abstractions in the `ignore` crate.

Fixes #444

1 files changed, 12 insertions, 2 deletions

diff --git a/ignore/src/gitignore.rs b/ignore/src/gitignore.rs
index 4972dcd5..68655261 100644
--- a/ignore/src/gitignore.rs
+++ b/ignore/src/gitignore.rs
@@ -279,7 +279,12 @@ impl GitignoreBuilder {
         let nignore = self.globs.iter().filter(|g| !g.is_whitelist()).count();
         let nwhite = self.globs.iter().filter(|g| g.is_whitelist()).count();
         let set = try!(
-            self.builder.build().map_err(|err| Error::Glob(err.to_string())));
+            self.builder.build().map_err(|err| {
+                Error::Glob {
+                    glob: None,
+                    err: err.to_string(),
+                }
+            }));
         Ok(Gitignore {
             set: set,
             root: self.root.clone(),
@@ -420,7 +425,12 @@ impl GitignoreBuilder {
             GlobBuilder::new(&glob.actual)
                 .literal_separator(literal_separator)
                 .build()
-                .map_err(|err| Error::Glob(err.to_string())));
+                .map_err(|err| {
+                    Error::Glob {
+                        glob: Some(glob.original.clone()),
+                        err: err.kind().to_string(),
+                    }
+                }));
         self.builder.add(parsed);
         self.globs.push(glob);
         Ok(self)