Avoid passing reference into struct

git2-rs changed the lifetime of the result of Patch::hunk() to reference
the patch struct:
rust-lang/git2-rs#1141

Thus, returning a patch struct and a reference into it is flagged by the
borrow checker upon move when returning.

This patch avoids returning both alltogether by separating retrieving
and retrieving the patch.

Author: Naseschwarz

asyncgit/src/sync/patches.rs

@@ -9,12 +9,12 @@ pub(crate) struct HunkLines<'a> {
 }
 
 #[allow(clippy::redundant_pub_crate)]
-pub(crate) fn get_file_diff_patch_and_hunklines<'a>(
+pub(crate) fn get_file_diff_patch<'a>(
 	repo: &'a Repository,
 	file: &str,
 	is_staged: bool,
 	reverse: bool,
-) -> Result<(Patch<'a>, Vec<HunkLines<'a>>)> {
+) -> Result<Patch<'a>> {
 	let diff = get_diff_raw(
 		repo,
 		file,
@@ -34,14 +34,12 @@ pub(crate) fn get_file_diff_patch_and_hunklines<'a>(
 		Error::Generic(String::from("no patch found"))
 	})?;
 
-	let lines = patch_get_hunklines(&patch)?;
-
-	Ok((patch, lines))
+	Ok(patch)
 }
 
 //
-fn patch_get_hunklines<'a>(
-	patch: &Patch<'a>,
+pub fn patch_get_hunklines<'a>(
+	patch: &'a Patch<'a>,
 ) -> Result<Vec<HunkLines<'a>>> {
 	let count_hunks = patch.num_hunks();
 	let mut res = Vec::with_capacity(count_hunks);

asyncgit/src/sync/staging/discard_tracked.rs

@@ -2,8 +2,8 @@ use super::{apply_selection, load_file};
 use crate::{
 	error::Result,
 	sync::{
-		diff::DiffLinePosition,
-		patches::get_file_diff_patch_and_hunklines, repository::repo,
+		diff::DiffLinePosition, patches::get_file_diff_patch,
+		patches::patch_get_hunklines, repository::repo,
 		utils::repo_write_file, RepoPath,
 	},
 };
@@ -27,9 +27,9 @@ pub fn discard_lines(
 	//TODO: check that file is not new (status modified)
 
 	let new_content = {
-		let (_patch, hunks) = get_file_diff_patch_and_hunklines(
-			&repo, file_path, false, false,
-		)?;
+		let patch =
+			get_file_diff_patch(&repo, file_path, false, false)?;
+		let hunks = patch_get_hunklines(&patch)?;
 
 		let working_content = load_file(&repo, file_path)?;
 		let old_lines = working_content.lines().collect::<Vec<_>>();

asyncgit/src/sync/staging/stage_tracked.rs

@@ -2,9 +2,8 @@ use super::apply_selection;
 use crate::{
 	error::{Error, Result},
 	sync::{
-		diff::DiffLinePosition,
-		patches::get_file_diff_patch_and_hunklines, repository::repo,
-		RepoPath,
+		diff::DiffLinePosition, patches::get_file_diff_patch,
+		patches::patch_get_hunklines, repository::repo, RepoPath,
 	},
 };
 use easy_cast::Conv;
@@ -39,9 +38,9 @@ pub fn stage_lines(
 	let indexed_content = String::from_utf8(blob.content().into())?;
 
 	let new_content = {
-		let (_patch, hunks) = get_file_diff_patch_and_hunklines(
-			&repo, file_path, is_stage, false,
-		)?;
+		let patch =
+			get_file_diff_patch(&repo, file_path, is_stage, false)?;
+		let hunks = patch_get_hunklines(&patch)?;
 
 		let old_lines = indexed_content.lines().collect::<Vec<_>>();