Add enclosing group to alternations in globs

Fixes #391.

1 files changed, 11 insertions, 2 deletions

diff --git a/globset/src/glob.rs b/globset/src/glob.rs
index 42d651fd..fbfc7d9b 100644
--- a/globset/src/glob.rs
+++ b/globset/src/glob.rs
@@ -659,9 +659,18 @@ impl Tokens {
                     for pat in patterns {
                         let mut altre = String::new();
                         self.tokens_to_regex(options, &pat, &mut altre);
-                        parts.push(altre);
+                        if !altre.is_empty() {
+                            parts.push(altre);
+                        }
+                    }
+
+                    // It is possible to have an empty set in which case the
+                    // resulting alternation '()' would be an error.
+                    if !parts.is_empty() {
+                        re.push('(');
+                        re.push_str(&parts.join("|"));
+                        re.push(')');
                     }
-                    re.push_str(&parts.join("|"));
                 }
             }
         }