Use FastPathBuf on Windows since OsStr::from_encoded_bytes_unchecked …

…is a thing now

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>

src/utils/fast_path.rs

@@ -52,8 +52,8 @@ impl FastPathBuf {
         if inner.len() > last_len {
             inner.truncate(last_len);
         } else {
-            inner.truncate({
-                let parent = bytes_as_path(inner).parent();
+            self.inner.truncate({
+                let parent = self.parent();
                 let parent = unsafe { parent.unwrap_unchecked() };
                 parent.as_os_str().len()
             });
@@ -85,10 +85,6 @@ impl From<PathBuf> for FastPathBuf {
     }
 }
 
-fn bytes_as_path(bytes: &[u8]) -> &Path {
-    OsStr::from_bytes(bytes).as_ref()
-}
-
 impl Default for FastPathBuf {
     fn default() -> Self {
         Self::new()
@@ -104,7 +100,7 @@ impl Deref for FastPathBuf {
             last_len: _,
         } = *self;
 
-        bytes_as_path(inner)
+        unsafe { OsStr::from_encoded_bytes_unchecked(inner) }.as_ref()
     }
 }
 

src/utils/mod.rs

@@ -1,10 +1,5 @@
-#[cfg(unix)]
-mod fast_path;
-#[cfg(not(unix))]
-pub use std::path::PathBuf as FastPathBuf;
-
-#[cfg(unix)]
 pub use fast_path::FastPathBuf;
+pub use file_names::*;
 
+mod fast_path;
 mod file_names;
-pub use file_names::*;