Use FastPathBuf on Windows since OsStr::from_encoded_bytes_unchecked …

…is a thing now

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

src/core/scheduler.rs

@@ -105,10 +105,7 @@ pub async fn run(
 
     let mut scheduler = Scheduler {
         stack: Vec::with_capacity(max_depth),
-        #[cfg(unix)]
         target_dir: FastPathBuf::from(root_dir),
-        #[cfg(not(unix))]
-        target_dir: root_dir,
 
         cache: {
             let paths = Vec::with_capacity(tasks.capacity() / 2);

src/utils/fast_path.rs

@@ -2,7 +2,6 @@ use std::{
     ffi::OsStr,
     fmt,
     ops::{Deref, DerefMut},
-    os::unix::ffi::{OsStrExt, OsStringExt},
     path::{Path, PathBuf, MAIN_SEPARATOR},
 };
 
@@ -52,8 +51,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()
             });
@@ -77,18 +76,14 @@ impl FastPathBuf {
 
 impl From<PathBuf> for FastPathBuf {
     fn from(p: PathBuf) -> Self {
-        let inner = p.into_os_string().into_vec();
+        let inner = p.into_os_string().into_encoded_bytes();
         Self {
             last_len: inner.len(),
             inner,
         }
     }
 }
 
-fn bytes_as_path(bytes: &[u8]) -> &Path {
-    OsStr::from_bytes(bytes).as_ref()
-}
-
 impl Default for FastPathBuf {
     fn default() -> Self {
         Self::new()
@@ -104,7 +99,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::*;