diff --git a/asyncgit/src/sync/diff.rs b/asyncgit/src/sync/diff.rs index dd4764e9..1fbbd937 100644 --- a/asyncgit/src/sync/diff.rs +++ b/asyncgit/src/sync/diff.rs @@ -180,7 +180,7 @@ pub fn get_diff( let work_dir = work_dir(&repo)?; let diff = get_diff_raw(&repo, p, stage, false, None)?; - raw_diff_to_file_diff(&diff, &work_dir) + raw_diff_to_file_diff(&diff, work_dir) } /// returns diff of a specific file inside a commit @@ -196,7 +196,7 @@ pub fn get_diff_commit( let work_dir = work_dir(&repo)?; let diff = get_commit_diff(&repo, id, Some(p))?; - raw_diff_to_file_diff(&diff, &work_dir) + raw_diff_to_file_diff(&diff, work_dir) } /// diff --git a/asyncgit/src/sync/utils.rs b/asyncgit/src/sync/utils.rs index 21d273d9..e9e67b28 100644 --- a/asyncgit/src/sync/utils.rs +++ b/asyncgit/src/sync/utils.rs @@ -4,11 +4,7 @@ use super::CommitId; use crate::error::{Error, Result}; use git2::{IndexAddOption, Repository, RepositoryOpenFlags}; use scopetime::scope_time; -use std::{ - fs::File, - io::Write, - path::{Path, PathBuf}, -}; +use std::{fs::File, io::Write, path::Path}; /// #[derive(PartialEq, Debug, Clone)] @@ -56,10 +52,8 @@ pub(crate) fn repo(repo_path: &str) -> Result { } /// -pub(crate) fn work_dir(repo: &Repository) -> Result { - let path = repo.workdir().ok_or(Error::NoWorkDir)?; - - Ok(path.into()) +pub(crate) fn work_dir(repo: &Repository) -> Result<&Path> { + repo.workdir().ok_or(Error::NoWorkDir) } ///