From 3548a621bf9fb9dae4c9b6c9b39117a9ca7e7c8a Mon Sep 17 00:00:00 2001
From: Steve Klabnik <steve@steveklabnik.com>
Date: Sun, 22 Sep 2019 10:19:40 -0500
Subject: [PATCH] Fix tests on Windows

Fixes #85
---
 src/lib.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8335d50..48f789d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -61,7 +61,6 @@
     html_root_url = "https://docs.rs/glob/0.3.0"
 )]
 #![deny(missing_docs)]
-#![cfg_attr(all(test, windows), feature(std_misc))]
 
 #[cfg(test)]
 #[macro_use]
@@ -177,7 +176,6 @@ pub fn glob(pattern: &str) -> Result<Paths, PatternError> {
 pub fn glob_with(pattern: &str, options: MatchOptions) -> Result<Paths, PatternError> {
     #[cfg(windows)]
     fn check_windows_verbatim(p: &Path) -> bool {
-        use std::path::Prefix;
         match p.components().next() {
             Some(Component::Prefix(ref p)) => p.kind().is_verbatim(),
             _ => false,
@@ -1086,12 +1084,21 @@ mod test {
         #[cfg(windows)]
         fn win() {
             use std::env::current_dir;
-            use std::ffi::AsOsStr;
+            use std::path::Component;
 
             // check windows absolute paths with host/device components
             let root_with_device = current_dir()
                 .ok()
-                .and_then(|p| p.prefix().map(|p| p.join("*")))
+                .and_then(|p| {
+                    match p.components().next().unwrap() {
+                        Component::Prefix(prefix_component) => {
+                            let path = Path::new(prefix_component.as_os_str());
+                            path.join("*");
+                            Some(path.to_path_buf())
+                        }
+                        _ => panic!("no prefix in this path"),
+                    }
+                })
                 .unwrap();
             // FIXME (#9639): This needs to handle non-utf8 paths
             assert!(glob(root_with_device.as_os_str().to_str().unwrap())