Fix build (#331)

Always a good idea to run all tests beforehand.

Author: Byron

Diff for: git-config/src/values.rs

@@ -2,7 +2,6 @@
 
 use std::{borrow::Cow, convert::TryFrom, fmt::Display, str::FromStr};
 
-use nom::AsChar;
 #[cfg(not(target_os = "windows"))]
 use pwd::Passwd;
 use quick_error::{quick_error, ResultExt};
@@ -381,13 +380,13 @@ impl<'a> Path<'a> {
     }
 
     #[cfg(target_os = "windows")]
-    fn interpolate_user(self) -> Result<Self, PathError> {
+    fn interpolate_user(self) -> Result<Cow<'a, std::path::Path>, PathError> {
         Err(PathError::UserInterpolationUnsupported)
     }
 
     #[cfg(not(target_os = "windows"))]
     fn interpolate_user(self) -> Result<Cow<'a, std::path::Path>, PathError> {
-        let (_prefix, val) = self.split_at('/'.len());
+        let (_prefix, val) = self.split_at("/".len());
         let i = val
             .iter()
             .position(|&e| e == b'/')

Diff for: git-worktree/src/lib.rs

@@ -88,7 +88,7 @@ pub mod index {
         where
             Find: for<'a> FnMut(&oid, &'a mut Vec<u8>) -> Option<git_object::BlobRef<'a>>,
         {
-            let dest = root.join(git_features::path::from_byte_slice(entry_path).ok_or_else(|| {
+            let dest = root.join(git_features::path::from_byte_slice(entry_path).map_err(|_| {
                 index::checkout::Error::IllformedUtf8 {
                     path: entry_path.to_owned(),
                 }
@@ -126,7 +126,7 @@ pub mod index {
                         path: root.to_path_buf(),
                     })?;
                     let symlink_destination = git_features::path::from_byte_slice(obj.data)
-                        .ok_or_else(|| index::checkout::Error::IllformedUtf8 { path: obj.data.into() })?;
+                        .map_err(|_| index::checkout::Error::IllformedUtf8 { path: obj.data.into() })?;
                     if symlinks {
                         #[cfg(unix)]
                         std::os::unix::fs::symlink(symlink_destination, &dest)?;