.

Author: svetli-n

git-config/src/values.rs

@@ -4,7 +4,7 @@ use std::{borrow::Cow, convert::TryFrom, fmt::Display, str::FromStr};
 
 use nom::AsChar;
 #[cfg(not(target_os = "windows"))]
-use pwd::{Passwd, PwdError};
+use pwd::Passwd;
 use quick_error::quick_error;
 #[cfg(feature = "serde")]
 use serde::{Serialize, Serializer};
@@ -371,7 +371,7 @@ impl Path<'_> {
         let (username, val) = val.split_at(i);
         let username = std::str::from_utf8(username)?;
         let home = Passwd::from_name(username)
-            .map_err(|_| PathError::Pwd)
+            .map_err(|_| PathError::Pwd)?
             .ok_or(PathError::Missing { what: "pwd user info" })?
             .dir;
         let mut expanded = home.as_bytes().to_owned();

git-features/src/path.rs

@@ -71,11 +71,7 @@ pub fn into_bytes<'a>(path: impl Into<Cow<'a, Path>>) -> Result<Cow<'a, [u8]>, U
                 path.into_os_string().into_vec()
             };
             #[cfg(not(unix))]
-            let p: Vec<_> = path
-                .into_os_string()
-                .into_string()
-                .map_err(|_| Utf8Error)?
-                .into();
+            let p: Vec<_> = path.into_os_string().into_string().map_err(|_| Utf8Error)?.into();
             p
         }),
         Cow::Borrowed(path) => Cow::Borrowed({
@@ -85,10 +81,7 @@ pub fn into_bytes<'a>(path: impl Into<Cow<'a, Path>>) -> Result<Cow<'a, [u8]>, U
                 path.as_os_str().as_bytes()
             };
             #[cfg(not(unix))]
-            let p = path
-                .to_str()
-                .ok_or(Utf8Error)?
-                .as_bytes();
+            let p = path.to_str().ok_or(Utf8Error)?.as_bytes();
             p
         }),
     };