Merge master and fix clippy issues

SergioRibera · SergioRibera · commit 747bc8022e38 · 2022-10-18T19:06:19.000-04:00
diff --git a/asyncgit/src/error.rs b/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}"))
 	}
 }
diff --git a/asyncgit/src/sync/branch/mod.rs b/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()))?;
 	}
 
diff --git a/asyncgit/src/sync/commit_details.rs b/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
 		}
diff --git a/asyncgit/src/sync/hooks.rs b/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))
 		}
diff --git a/asyncgit/src/sync/remotes/push.rs b/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)) =
diff --git a/asyncgit/src/sync/remotes/tags.rs b/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)?;
diff --git a/src/app.rs b/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())?;
 				}
diff --git a/src/components/branchlist.rs b/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(
diff --git a/src/components/commit.rs b/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 = {
diff --git a/src/components/commitlist.rs b/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!(
 			"{} {}/{} {}",
diff --git a/src/components/create_branch.rs b/src/components/create_branch.rs
@@ -142,7 +142,7 @@ impl CreateBranchComponent {
 			Err(e) => {
 				log::error!("create branch: {}", e,);
 				self.queue.push(InternalEvent::ShowErrorMsg(
-					format!("create branch error:\n{}", e,),
+					format!("create branch error:\n{e}",),
 				));
 			}
 		}
diff --git a/src/components/diff.rs b/src/components/diff.rs
@@ -198,7 +198,7 @@ impl DiffComponent {
 
 	fn move_selection(&mut self, move_type: ScrollType) {
 		if let Some(diff) = &self.diff {
-			let max = diff.lines.saturating_sub(1) as usize;
+			let max = diff.lines.saturating_sub(1);
 
 			let new_start = match move_type {
 				ScrollType::Down => {
@@ -229,7 +229,7 @@ impl DiffComponent {
 
 	fn update_selection(&mut self, new_start: usize) {
 		if let Some(diff) = &self.diff {
-			let max = diff.lines.saturating_sub(1) as usize;
+			let max = diff.lines.saturating_sub(1);
 			let new_start = cmp::min(max, new_start);
 			self.selection = Selection::Single(new_start);
 			self.selected_hunk =
@@ -303,9 +303,8 @@ impl DiffComponent {
 		if let Some(diff) = &self.diff {
 			if diff.hunks.is_empty() {
 				let is_positive = diff.size_delta >= 0;
-				let delta_byte_size = ByteSize::b(
-					diff.size_delta.unsigned_abs() as u64,
-				);
+				let delta_byte_size =
+					ByteSize::b(diff.size_delta.unsigned_abs());
 				let sign = if is_positive { "+" } else { "-" };
 				res.extend(vec![Spans::from(vec![
 					Span::raw(Cow::from("size: ")),
@@ -378,7 +377,7 @@ impl DiffComponent {
 											.selection
 											.contains(line_cursor),
 									hunk_selected,
-									i == hunk_len as usize - 1,
+									i == hunk_len - 1,
 									&self.theme,
 								));
 								lines_added += 1;
diff --git a/src/components/file_revlog.rs b/src/components/file_revlog.rs
@@ -231,7 +231,7 @@ impl FileRevlogComponent {
 			let commits = get_commits_info(
 				&self.repo_path.borrow(),
 				&git_log.get_slice(start, SLICE_SIZE)?,
-				self.current_width.get() as usize,
+				self.current_width.get(),
 			);
 
 			if let Ok(commits) = commits {
diff --git a/src/components/options_popup.rs b/src/components/options_popup.rs
@@ -134,7 +134,7 @@ impl OptionsPopupComponent {
 				self.theme.text(true, false),
 			),
 			Span::styled(
-				format!("{:^w$}", value, w = half),
+				format!("{value:^half$}"),
 				self.theme.text(true, selected),
 			),
 		]));
diff --git a/src/components/pull.rs b/src/components/pull.rs
@@ -118,7 +118,7 @@ impl PullComponent {
 				self.pending = false;
 				self.hide();
 				self.queue.push(InternalEvent::ShowErrorMsg(
-					format!("fetch failed:\n{}", error),
+					format!("fetch failed:\n{error}"),
 				));
 			}
 		}
diff --git a/src/components/push.rs b/src/components/push.rs
@@ -181,7 +181,7 @@ impl PushComponent {
 		if !self.pending {
 			if let Some(err) = self.git_push.last_result()? {
 				self.queue.push(InternalEvent::ShowErrorMsg(
-					format!("push failed:\n{}", err),
+					format!("push failed:\n{err}"),
 				));
 			}
 			self.hide();
diff --git a/src/components/push_tags.rs b/src/components/push_tags.rs
@@ -123,7 +123,7 @@ impl PushTagsComponent {
 		if !self.pending {
 			if let Some(err) = self.git_push.last_result()? {
 				self.queue.push(InternalEvent::ShowErrorMsg(
-					format!("push tags failed:\n{}", err),
+					format!("push tags failed:\n{err}"),
 				));
 			}
 			self.hide();
diff --git a/src/components/rename_branch.rs b/src/components/rename_branch.rs
@@ -144,7 +144,7 @@ impl RenameBranchComponent {
 				Err(e) => {
 					log::error!("create branch: {}", e,);
 					self.queue.push(InternalEvent::ShowErrorMsg(
-						format!("rename branch error:\n{}", e,),
+						format!("rename branch error:\n{e}",),
 					));
 				}
 			}
diff --git a/src/components/status_tree.rs b/src/components/status_tree.rs
@@ -167,7 +167,7 @@ impl StatusTreeComponent {
 		let indent_str = if indent == 0 {
 			String::new()
 		} else {
-			format!("{:w$}", " ", w = (indent as usize) * 2)
+			format!("{:w$}", " ", w = indent * 2)
 		};
 
 		if !visible {
@@ -192,7 +192,7 @@ impl StatusTreeComponent {
 						w = width as usize
 					)
 				} else {
-					format!("{} {}{}", status_char, indent_str, file)
+					format!("{status_char} {indent_str}{file}")
 				};
 
 				Some(Span::styled(
diff --git a/src/components/submodules.rs b/src/components/submodules.rs
@@ -387,7 +387,7 @@ impl SubmodulesListComponent {
 			);
 
 			let span_name = Span::styled(
-				format!("{:w$} ", module_path, w = name_length),
+				format!("{module_path:name_length$} "),
 				theme.text(true, selected),
 			);
 
diff --git a/src/components/tag_commit.rs b/src/components/tag_commit.rs
@@ -194,7 +194,7 @@ impl TagCommitComponent {
 
 					log::error!("e: {}", e,);
 					self.queue.push(InternalEvent::ShowErrorMsg(
-						format!("tag error:\n{}", e,),
+						format!("tag error:\n{e}",),
 					));
 				}
 			}
diff --git a/src/components/textinput.rs b/src/components/textinput.rs
@@ -305,7 +305,7 @@ impl TextInputComponent {
 	fn draw_char_count<B: Backend>(&self, f: &mut Frame<B>, r: Rect) {
 		let count = self.msg.len();
 		if count > 0 {
-			let w = Paragraph::new(format!("[{} chars]", count))
+			let w = Paragraph::new(format!("[{count} chars]"))
 				.alignment(Alignment::Right);
 
 			let mut rect = {
diff --git a/src/components/utils/logitems.rs b/src/components/utils/logitems.rs
@@ -55,7 +55,7 @@ impl LogEntry {
 			} else {
 				format!("{:0>2}m ago", delta.num_minutes())
 			};
-			format!("{: <10}", delta_str)
+			format!("{delta_str: <10}")
 		} else if self.time.date() == now.date() {
 			self.time.format("%T  ").to_string()
 		} else {
diff --git a/src/components/utils/mod.rs b/src/components/utils/mod.rs
@@ -47,11 +47,11 @@ pub fn string_width_align(s: &str, width: usize) -> String {
 	if (len >= width_wo_postfix && len <= width)
 		|| (len <= width_wo_postfix)
 	{
-		format!("{:w$}", s, w = width)
+		format!("{s:width$}")
 	} else {
 		let mut s = s.to_string();
 		s.truncate(find_truncate_point(&s, width_wo_postfix));
-		format!("{}{}", s, POSTFIX)
+		format!("{s}{POSTFIX}")
 	}
 }
 
diff --git a/src/components/utils/statustree.rs b/src/components/utils/statustree.rs
@@ -352,7 +352,7 @@ impl StatusTree {
 			*collapsed = true;
 		}
 
-		let path = format!("{}/", path);
+		let path = format!("{path}/");
 
 		for i in index + 1..self.tree.len() {
 			let item = &mut self.tree[i];
@@ -373,7 +373,7 @@ impl StatusTree {
 			*collapsed = false;
 		}
 
-		let path = format!("{}/", path);
+		let path = format!("{path}/");
 
 		self.update_visibility(
 			Some(path.as_str()),
diff --git a/src/main.rs b/src/main.rs
diff --git a/src/strings.rs b/src/strings.rs
diff --git a/src/tabs/stashlist.rs b/src/tabs/stashlist.rs
diff --git a/src/tabs/status.rs b/src/tabs/status.rs
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
diff --git a/src/ui/reflow.rs b/src/ui/reflow.rs

Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,12 @@ pub type Result<T> = std::result::Result<T, Error>;`
`83`	`83`
`84`	`84`	`impl<T> From<std::sync::PoisonError<T>> for Error {`
`85`	`85`	`fn from(error: std::sync::PoisonError<T>) -> Self {`
`86`		`- Self::Generic(format!("poison error: {}", error))`
	`86`	`+ Self::Generic(format!("poison error: {error}"))`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`impl<T> From<crossbeam_channel::SendError<T>> for Error {`
`91`	`91`	`fn from(error: crossbeam_channel::SendError<T>) -> Self {`
`92`		`- Self::Generic(format!("send error: {}", error))`
	`92`	`+ Self::Generic(format!("send error: {error}"))`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ pub(crate) fn branch_set_upstream(`
`206`	`206`
`207`	`207`	`if branch.upstream().is_err() {`
`208`	`208`	`let remote = get_default_remote_in_repo(repo)?;`
`209`		`- let upstream_name = format!("{}/{}", remote, branch_name);`
	`209`	`+ let upstream_name = format!("{remote}/{branch_name}");`
`210`	`210`	`branch.set_upstream(Some(upstream_name.as_str()))?;`
`211`	`211`	`}`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ impl CommitMessage {`
`60`	`60`	`///`
`61`	`61`	`pub fn combine(self) -> String {`
`62`	`62`	`if let Some(body) = self.body {`
`63`		`- format!("{}\n{}", self.subject, body)`
	`63`	`+ format!("{}\n{body}", self.subject)`
`64`	`64`	`} else {`
`65`	`65`	`self.subject`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ impl HookPaths {`
`87`	`87`	`} else {`
`88`	`88`	`let err = String::from_utf8_lossy(&output.stderr);`
`89`	`89`	`let out = String::from_utf8_lossy(&output.stdout);`
`90`		`- let formatted = format!("{}{}", out, err);`
	`90`	`+ let formatted = format!("{out}{err}");`
`91`	`91`
`92`	`92`	`Ok(HookResult::NotOk(formatted))`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ impl App {`
`448`	`448`
`449`	`449`	`if let Err(e) = result {`
`450`	`450`	`let msg =`
`451`		`- format!("failed to launch editor:\n{}", e);`
	`451`	`+ format!("failed to launch editor:\n{e}");`
`452`	`452`	`log::error!("{}", msg.as_str());`
`453`	`453`	`self.msg.show_error(msg.as_str())?;`
`454`	`454`	`}`