From b0d66cb176187809e6a81457e25521692222caac Mon Sep 17 00:00:00 2001
From: extrawurst <mail@rusticorn.com>
Date: Fri, 15 Dec 2023 20:00:21 +0100
Subject: [PATCH] clippy fixes

---
 asyncgit/src/sync/diff.rs         |  8 +++-----
 git2-summarize/examples/simple.rs |  3 ++-
 git2-summarize/src/lib.rs         | 32 +------------------------------
 src/components/commit.rs          |  2 +-
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/asyncgit/src/sync/diff.rs b/asyncgit/src/sync/diff.rs
index 5f876914..739ac903 100644
--- a/asyncgit/src/sync/diff.rs
+++ b/asyncgit/src/sync/diff.rs
@@ -415,11 +415,9 @@ pub fn unified_stage_diff(repo_path: &RepoPath) -> Result<String> {
 			_ => "",
 		};
 
-		output.push_str(&format!(
-			"{}{}",
-			prefix,
-			bytes2string(line.content()).unwrap()
-		));
+		if let Ok(line) = bytes2string(line.content()) {
+			output.push_str(&format!("{prefix}{line}"));
+		}
 
 		true
 	})?;
diff --git a/git2-summarize/examples/simple.rs b/git2-summarize/examples/simple.rs
index a39e800d..2074aec0 100644
--- a/git2-summarize/examples/simple.rs
+++ b/git2-summarize/examples/simple.rs
@@ -3,9 +3,10 @@ use std::env;
 fn main() {
 	let diff = include_str!("simple.diff");
 
-	let summary = git2_summarize::git_diff_summarize_old(
+	let summary = git2_summarize::git_diff_summarize(
 		&env::var("OPENAI_API_KEY").unwrap(),
 		diff,
+		50,
 	)
 	.unwrap();
 
diff --git a/git2-summarize/src/lib.rs b/git2-summarize/src/lib.rs
index 20d8242f..63a89200 100644
--- a/git2-summarize/src/lib.rs
+++ b/git2-summarize/src/lib.rs
@@ -1,41 +1,11 @@
-//!	Uses Open API GPT-3 to summarize unified git diffs
+//! Uses Open API GPT-3 to summarize unified git diffs
 
 use openai_api_rs::v1::{
 	api::Client,
 	chat_completion::{self, ChatCompletionRequest},
 	common::GPT3_5_TURBO,
-	completion::{self, CompletionRequest},
 };
 
-/// Uses old GPT3_TEXT_DAVINCI_003 model to generate message
-///
-///  # Arguments
-///
-/// * `api_key` - open api key
-/// * `diff` - expects a diff formatted as a unified diff
-pub fn git_diff_summarize_old(
-	api_key: &str,
-	diff: &str,
-) -> Result<String, String> {
-	let client = Client::new(api_key.to_string());
-
-	let req = CompletionRequest::new(
-        completion::GPT3_TEXT_DAVINCI_003.to_string(),
-        format!("Generate a Git commit message based on the following summary: {}\n\nCommit message: ",diff),
-    )
-    .max_tokens(500)
-    .temperature(0.5)
-    .n(1);
-
-	let result = client.completion(req).map_err(|e| e.message)?;
-	Ok(result
-		.choices
-		.get(0)
-		.ok_or_else(|| String::from("choises empty"))?
-		.text
-		.clone())
-}
-
 /// Uses GPT3_5_TURBO model to generate message using chat completion API
 ///
 ///  # Arguments
diff --git a/src/components/commit.rs b/src/components/commit.rs
index 95081b30..f86377e1 100644
--- a/src/components/commit.rs
+++ b/src/components/commit.rs
@@ -367,7 +367,7 @@ impl CommitComponent {
 			}
 
 			match git2_summarize::git_diff_summarize(
-				&api_key,
+				api_key,
 				&unified_diff,
 				FIRST_LINE_LIMIT,
 			) {