Fix glob tests.

When matching directly with a regex, we need to make sure the path is
normalized first.

appveyor.yml

@@ -37,7 +37,8 @@ test_script:
 
 before_deploy:
   # Generate artifacts for release
-  - RUSTFLAGS="-C target-feature=+ssse3" cargo build --release --features simd-accel
+  - SET RUSTFLAGS="-C target-feature=+ssse3"
+  - cargo build --release --features simd-accel
   - mkdir staging
   # TODO update this part to copy the artifacts that make sense for your project
   - copy target\release\xrep.exe staging

src/glob.rs

@@ -214,7 +214,7 @@ impl Pattern {
     /// regular expression and will represent the matching semantics of this
     /// glob pattern and the options given.
     pub fn to_regex_with(&self, options: &MatchOptions) -> String {
-        let sep = path::MAIN_SEPARATOR.to_string();
+        let sep = regex::quote(&path::MAIN_SEPARATOR.to_string());
         let mut re = String::new();
         re.push_str("(?-u)");
         if options.case_insensitive {
@@ -235,14 +235,14 @@ impl Pattern {
                 }
                 Token::Any => {
                     if options.require_literal_separator {
-                        re.push_str(&format!("[^{}]", regex::quote(&sep)));
+                        re.push_str(&format!("[^{}]", sep));
                     } else {
                         re.push_str(".");
                     }
                 }
                 Token::ZeroOrMore => {
                     if options.require_literal_separator {
-                        re.push_str(&format!("[^{}]*", regex::quote(&sep)));
+                        re.push_str(&format!("[^{}]*", sep));
                     } else {
                         re.push_str(".*");
                     }
@@ -414,6 +414,8 @@ impl<'a> Parser<'a> {
 
 #[cfg(test)]
 mod tests {
+    use std::path::Path;
+
     use regex::bytes::Regex;
 
     use super::{Error, Pattern, MatchOptions, SetBuilder, Token};
@@ -461,8 +463,9 @@ mod tests {
             #[test]
             fn $name() {
                 let pat = Pattern::new($pat).unwrap();
+                let path = &Path::new($path).to_str().unwrap();
                 let re = Regex::new(&pat.to_regex_with(&$options)).unwrap();
-                assert!(re.is_match($path.as_bytes()));
+                assert!(re.is_match(path.as_bytes()));
             }
         };
     }
@@ -475,8 +478,9 @@ mod tests {
             #[test]
             fn $name() {
                 let pat = Pattern::new($pat).unwrap();
+                let path = &Path::new($path).to_str().unwrap();
                 let re = Regex::new(&pat.to_regex_with(&$options)).unwrap();
-                assert!(!re.is_match($path.as_bytes()));
+                assert!(!re.is_match(path.as_bytes()));
             }
         };
     }

src/printer.rs

@@ -239,6 +239,7 @@ impl<W: Send + io::Write> Printer<W> {
     fn line_number(&mut self, n: u64, sep: u8) {
         if self.wtr.is_color() {
             let _ = self.wtr.fg(YELLOW);
+            let _ = self.wtr.attr(term::Attr::Bold);
         }
         self.write(n.to_string().as_bytes());
         if self.wtr.is_color() {

src/sys.rs

@@ -37,6 +37,6 @@ pub fn stdout_is_atty() -> bool {
     unsafe {
         let fd = winapi::winbase::STD_OUTPUT_HANDLE;
         let mut out = 0;
-        kernel32::GetConsoleMode(handle, &mut out) != 0
+        kernel32::GetConsoleMode(kernel32::GetStdHandle(fd), &mut out) != 0
     }
 }