Use git_features path methods.

Author: svetli-n

Cargo.lock

@@ -14,6 +14,7 @@ include = ["src/**/*", "LICENSE-*", "README.md", "CHANGELOG.md"]
 # serde = ["serde_crate"]
 
 [dependencies]
+git-features = { version = "^0.19.1", path = "../git-features", features = ["walkdir", "bstr"]}
 dirs = "4"
 nom = { version = "7", default_features = false, features = [ "std" ] }
 memchr = "2"

git-config/Cargo.toml

@@ -307,22 +307,20 @@ impl Path<'_> {
         const PREFIX: &[u8] = b"%(prefix)/";
         const SLASH: u8 = b'/';
         if val.starts_with(PREFIX) {
-            let mut expanded = git_install_dir.ok_or(())?.to_str().ok_or(())?.as_bytes().to_owned();
+            let mut expanded = git_features::path::into_bytes(git_install_dir.ok_or(())?)
+                .ok_or(())?
+                .into_owned();
             let (_prefix, val) = val.split_at(PREFIX.len() - 1);
             expanded.extend(val);
             Ok(Path {
                 value: Cow::Owned(expanded),
             })
         } else if val.starts_with(b"~/") {
-            let home = dirs::home_dir().ok_or(())?.to_str().ok_or(())?.to_owned();
-            #[cfg(target_os = "windows")]
-            let mut home = home.replace("\\", "/");
-            let mut expanded = home.as_bytes().to_owned();
+            let mut expanded = dirs::home_dir().ok_or(())?.to_str().ok_or(())?.as_bytes().to_owned();
             let (_prefix, val) = val.split_at(SLASH.len());
             expanded.extend(val);
-            Ok(Path {
-                value: Cow::Owned(expanded),
-            })
+            let expanded = git_features::path::convert::to_native_separators(expanded);
+            Ok(Path { value: expanded })
         } else if val.starts_with(b"~") && val.contains(&SLASH) {
             Self::interpolate_user(val, SLASH)
         } else {
@@ -331,7 +329,7 @@ impl Path<'_> {
     }
 
     #[cfg(target_os = "windows")]
-    fn interpolate_user(val: Cow<[u8]>, slash: u8) -> Result<Path, ()> {
+    fn interpolate_user(_val: Cow<[u8]>, _slash: u8) -> Result<Path, ()> {
         Err(())
     }
 
@@ -340,10 +338,8 @@ impl Path<'_> {
         let (_prefix, val) = val.split_at(slash.len());
         let i = val.iter().position(|&e| e == slash).ok_or(())?;
         let (username, val) = val.split_at(i);
-        let home = Passwd::from_name(std::str::from_utf8(username).map_err(|_| ())?)
-            .map_err(|_| ())?
-            .ok_or(())?
-            .dir;
+        let path = git_features::path::from_bytes(username).ok_or(())?;
+        let home = Passwd::from_name(path.to_str().ok_or(())?).map_err(|_|())?.ok_or(())?.dir;
         let mut expanded = home.as_bytes().to_owned();
         expanded.extend(val);
         Ok(Path {