Merge master and fix clippy issues

Author: SergioRibera

asyncgit/src/error.rs

@@ -83,12 +83,12 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 impl<T> From<std::sync::PoisonError<T>> for Error {
 	fn from(error: std::sync::PoisonError<T>) -> Self {
-		Self::Generic(format!("poison error: {}", error))
+		Self::Generic(format!("poison error: {error}"))
 	}
 }
 
 impl<T> From<crossbeam_channel::SendError<T>> for Error {
 	fn from(error: crossbeam_channel::SendError<T>) -> Self {
-		Self::Generic(format!("send error: {}", error))
+		Self::Generic(format!("send error: {error}"))
 	}
 }

asyncgit/src/sync/branch/mod.rs

@@ -206,7 +206,7 @@ pub(crate) fn branch_set_upstream(
 
 	if branch.upstream().is_err() {
 		let remote = get_default_remote_in_repo(repo)?;
-		let upstream_name = format!("{}/{}", remote, branch_name);
+		let upstream_name = format!("{remote}/{branch_name}");
 		branch.set_upstream(Some(upstream_name.as_str()))?;
 	}
 

asyncgit/src/sync/commit_details.rs

@@ -60,7 +60,7 @@ impl CommitMessage {
 	///
 	pub fn combine(self) -> String {
 		if let Some(body) = self.body {
-			format!("{}\n{}", self.subject, body)
+			format!("{}\n{body}", self.subject)
 		} else {
 			self.subject
 		}

asyncgit/src/sync/hooks.rs

@@ -87,7 +87,7 @@ impl HookPaths {
 		} else {
 			let err = String::from_utf8_lossy(&output.stderr);
 			let out = String::from_utf8_lossy(&output.stdout);
-			let formatted = format!("{}{}", out, err);
+			let formatted = format!("{out}{err}");
 
 			Ok(HookResult::NotOk(formatted))
 		}

asyncgit/src/sync/remotes/push.rs

@@ -164,7 +164,7 @@ pub fn push_raw(
 	};
 
 	let branch_name =
-		format!("{}refs/{}/{}", branch_modifier, ref_type, branch);
+		format!("{branch_modifier}refs/{ref_type}/{branch}");
 	remote.push(&[branch_name.as_str()], Some(&mut options))?;
 
 	if let Some((reference, msg)) =

asyncgit/src/sync/remotes/tags.rs

@@ -89,7 +89,7 @@ pub fn tags_missing_remote(
 
 	let mut local_tags = tags
 		.iter()
-		.filter_map(|tag| tag.map(|tag| format!("refs/tags/{}", tag)))
+		.filter_map(|tag| tag.map(|tag| format!("refs/tags/{tag}")))
 		.collect::<HashSet<_>>();
 	let remote_tags =
 		remote_tag_refs(repo_path, remote, basic_credential)?;

src/app.rs

@@ -448,7 +448,7 @@ impl App {
 
 				if let Err(e) = result {
 					let msg =
-						format!("failed to launch editor:\n{}", e);
+						format!("failed to launch editor:\n{e}");
 					log::error!("{}", msg.as_str());
 					self.msg.show_error(msg.as_str())?;
 				}

src/components/branchlist.rs

@@ -609,7 +609,7 @@ impl BranchListComponent {
 			};
 
 			let span_prefix = Span::styled(
-				format!("{}{} ", is_head_str, upstream_tracking_str),
+				format!("{is_head_str}{upstream_tracking_str} "),
 				theme.commit_author(selected),
 			);
 			let span_hash = Span::styled(

src/components/commit.rs

@@ -94,7 +94,7 @@ impl CommitComponent {
 
 	fn draw_branch_name<B: Backend>(&self, f: &mut Frame<B>) {
 		if let Some(name) = self.git_branch_name.last() {
-			let w = Paragraph::new(format!("{{{}}}", name))
+			let w = Paragraph::new(format!("{{{name}}}"))
 				.alignment(Alignment::Right);
 
 			let rect = {

src/components/commitlist.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::needless_pass_by_value)]
 use super::utils::logitems::{ItemBatch, LogEntry};
 use crate::{
 	components::{
@@ -191,7 +192,7 @@ impl CommitList {
 					format!("{}^..{}", f.hash_short, l.hash_short);
 				if let Err(e) = crate::clipboard::copy_string(&yank) {
 					self.queue.push(InternalEvent::ShowErrorMsg(
-						copy_fail(e.to_string()),
+						copy_fail(&e.to_string()),
 					));
 					return Err(e);
 				}
@@ -215,7 +216,7 @@ impl CommitList {
 
 			if let Err(e) = crate::clipboard::copy_string(&separate) {
 				self.queue.push(InternalEvent::ShowErrorMsg(
-					copy_fail(e.to_string()),
+					copy_fail(&e.to_string()),
 				));
 				return Err(e);
 			}
@@ -238,7 +239,7 @@ impl CommitList {
 						crate::clipboard::copy_string(&e.hash_short)
 					{
 						self.queue.push(InternalEvent::ShowErrorMsg(
-							copy_fail(e.to_string()),
+							copy_fail(&e.to_string()),
 						));
 						return Err(e);
 					}
@@ -255,7 +256,7 @@ impl CommitList {
 						crate::clipboard::copy_string(&e.hash_short)
 					{
 						self.queue.push(InternalEvent::ShowErrorMsg(
-							copy_fail(e.to_string()),
+							copy_fail(&e.to_string()),
 						));
 						return Err(e);
 					}
@@ -406,7 +407,7 @@ impl CommitList {
 		txt.push(splitter.clone());
 
 		let author_width =
-			(width.saturating_sub(19) / 3).max(3).min(20);
+			(width.saturating_sub(19) / 3).clamp(3, 20);
 		let author = string_width_align(&e.author, author_width);
 
 		// commit author
@@ -418,18 +419,14 @@ impl CommitList {
 		txt.push(splitter.clone());
 
 		// commit tags
-		if let Some(tags) = tags {
-			txt.push(splitter.clone());
-			txt.push(Span::styled(tags, theme.tags(selected)));
-		}
-
-		if let Some(branches) = branches {
-			txt.push(splitter.clone());
-			txt.push(Span::styled(
-				branches,
-				theme.branch(selected, true),
-			));
-		}
+		txt.push(Span::styled(
+			Cow::from(
+				tags.map_or_else(String::new, |tags| {
+					format!(" {tags}")
+				}),
+			),
+			theme.tags(selected),
+		));
 
 		txt.push(splitter);
 
@@ -439,7 +436,7 @@ impl CommitList {
 
 		// commit msg
 		txt.push(Span::styled(
-			format!("{:w$}", &e.msg, w = message_width),
+			format!("{:message_width$}", &e.msg),
 			theme.text(true, selected),
 		));
 
@@ -474,7 +471,7 @@ impl CommitList {
 			let branches = self.branches.get(&e.id).map(|names| {
 				names
 					.iter()
-					.map(|name| format!("{{{}}}", name))
+					.map(|name| format!("{{{name}}}"))
 					.join(" ")
 			});
 
@@ -542,7 +539,7 @@ impl DrawableComponent for CommitList {
 		));
 
 		let branch_post_fix =
-			self.branch.as_ref().map(|b| format!("- {{{}}}", b));
+			self.branch.as_ref().map(|b| format!("- {{{b}}}"));
 
 		let title = format!(
 			"{} {}/{} {}",