Fix clippy remarks

Author: Naseschwarz

asyncgit/src/sync/branch/mod.rs

@@ -271,7 +271,7 @@ pub fn config_is_pull_rebase(repo_path: &RepoPath) -> Result<bool> {
 		let value =
 			rebase.value().map(String::from).unwrap_or_default();
 		return Ok(value == "true");
-	};
+	}
 
 	Ok(false)
 }
@@ -701,7 +701,7 @@ mod tests_branches {
 			&root.as_os_str().to_str().unwrap().into();
 
 		let upstream_merge_res =
-			get_branch_upstream_merge(&repo_path, "master");
+			get_branch_upstream_merge(repo_path, "master");
 		assert!(
 			upstream_merge_res.is_ok_and(|v| v.as_ref().is_none())
 		);
@@ -721,12 +721,12 @@ mod tests_branches {
 		config
 			.set_str(
 				&format!("branch.{branch_name}.merge"),
-				&upstrem_merge,
+				upstrem_merge,
 			)
 			.expect("fail set branch merge config");
 
 		let upstream_merge_res =
-			get_branch_upstream_merge(&repo_path, &branch_name);
+			get_branch_upstream_merge(repo_path, branch_name);
 		assert!(upstream_merge_res
 			.as_ref()
 			.is_ok_and(|v| v.as_ref().is_some()));

asyncgit/src/sync/remotes/push.rs

@@ -1,3 +1,5 @@
+use std::fmt::Write;
+
 use crate::{
 	error::{Error, Result},
 	progress::ProgressPercent,
@@ -182,7 +184,8 @@ pub fn push_raw(
 		if let Ok(Some(branch_upstream_merge)) =
 			get_branch_upstream_merge(repo_path, branch)
 		{
-			push_ref.push_str(&format!(":{branch_upstream_merge}"));
+			write!(&mut push_ref, ":{branch_upstream_merge}")
+				.map_err(|e| Error::Generic(e.to_string()))?;
 		}
 	}
 
@@ -289,7 +292,7 @@ mod tests {
 
 		// Attempt force push,
 		// should work as it forces the push through
-		assert!(!push_branch(
+		assert!(push_branch(
 			&tmp_other_repo_dir.path().to_str().unwrap().into(),
 			"origin",
 			"master",
@@ -298,7 +301,7 @@ mod tests {
 			None,
 			None,
 		)
-		.is_err());
+		.is_ok());
 	}
 
 	#[test]

asyncgit/src/sync/stash.rs

@@ -144,7 +144,7 @@ mod tests {
 		let repo_path: &RepoPath =
 			&root.as_os_str().to_str().unwrap().into();
 
-		assert!(!stash_save(repo_path, None, true, false).is_ok());
+		assert!(stash_save(repo_path, None, true, false).is_err());
 
 		assert!(get_stashes(repo_path).unwrap().is_empty());
 	}

asyncgit/src/sync/utils.rs

@@ -242,7 +242,7 @@ mod tests {
 		let root = repo.path().parent().unwrap();
 		let repo_path = root.as_os_str().to_str().unwrap();
 
-		assert!(!stage_add_file(&repo_path.into(), file_path).is_ok());
+		assert!(stage_add_file(&repo_path.into(), file_path).is_err());
 	}
 
 	#[test]
@@ -440,7 +440,7 @@ mod tests {
 		let repo_path: &RepoPath =
 			&root.as_os_str().to_str().unwrap().into();
 
-		assert!(!get_head(repo_path).is_ok());
+		assert!(get_head(repo_path).is_err());
 
 		Ok(())
 	}

filetreelist/src/item.rs

@@ -55,7 +55,7 @@ impl TreeItemInfo {
 				Path::new(
 					self.full_path
 						.components()
-						.last()
+						.next_back()
 						.and_then(|c| c.as_os_str().to_str())
 						.unwrap_or_default(),
 				)

filetreelist/src/treeitems_iter.rs

@@ -35,7 +35,7 @@ impl<'a> Iterator for TreeItemsIterator<'a> {
 				*i += 1;
 			} else {
 				self.increments = Some(0);
-			};
+			}
 
 			loop {
 				if !init {

src/app.rs

@@ -275,7 +275,7 @@ impl App {
 				3 => self.stashing_tab.draw(f, chunks_main[1])?,
 				4 => self.stashlist_tab.draw(f, chunks_main[1])?,
 				_ => bail!("unknown tab"),
-			};
+			}
 		}
 
 		self.draw_popups(f)?;
@@ -905,7 +905,7 @@ impl App {
 			InternalEvent::CommitSearch(options) => {
 				self.revlog.search(options);
 			}
-		};
+		}
 
 		Ok(flags)
 	}
@@ -997,7 +997,7 @@ impl App {
 					undo_last_commit(&self.repo.borrow())
 				);
 			}
-		};
+		}
 
 		flags.insert(NeedsUpdate::ALL);
 
@@ -1019,7 +1019,7 @@ impl App {
 			));
 
 			self.tags_popup.update_tags()?;
-		};
+		}
 		Ok(())
 	}
 

src/args.rs

@@ -139,7 +139,7 @@ fn setup_logging(path_override: Option<PathBuf>) -> Result<()> {
 		path
 	};
 
-	println!("Logging enabled. Log written to: {path:?}");
+	println!("Logging enabled. Log written to: {}", path.display());
 
 	WriteLogger::init(
 		LevelFilter::Trace,

src/components/changes.rs

@@ -92,7 +92,7 @@ impl ChangesComponent {
 							&self.repo.borrow(),
 							path,
 						)?,
-					};
+					}
 				} else {
 					let config =
 						self.options.borrow().status_show_untracked();

src/components/commitlist.rs

@@ -490,24 +490,36 @@ impl CommitList {
 			txt.push(splitter.clone());
 		}
 
-		let style_hash = normal
-			.then(|| theme.commit_hash(selected))
-			.unwrap_or_else(|| theme.commit_unhighlighted());
-		let style_time = normal
-			.then(|| theme.commit_time(selected))
-			.unwrap_or_else(|| theme.commit_unhighlighted());
-		let style_author = normal
-			.then(|| theme.commit_author(selected))
-			.unwrap_or_else(|| theme.commit_unhighlighted());
-		let style_tags = normal
-			.then(|| theme.tags(selected))
-			.unwrap_or_else(|| theme.commit_unhighlighted());
-		let style_branches = normal
-			.then(|| theme.branch(selected, true))
-			.unwrap_or_else(|| theme.commit_unhighlighted());
-		let style_msg = normal
-			.then(|| theme.text(true, selected))
-			.unwrap_or_else(|| theme.commit_unhighlighted());
+		let style_hash = if normal {
+			theme.commit_hash(selected)
+		} else {
+			theme.commit_unhighlighted()
+		};
+		let style_time = if normal {
+			theme.commit_time(selected)
+		} else {
+			theme.commit_unhighlighted()
+		};
+		let style_author = if normal {
+			theme.commit_author(selected)
+		} else {
+			theme.commit_unhighlighted()
+		};
+		let style_tags = if normal {
+			theme.tags(selected)
+		} else {
+			theme.commit_unhighlighted()
+		};
+		let style_branches = if normal {
+			theme.branch(selected, true)
+		} else {
+			theme.commit_unhighlighted()
+		};
+		let style_msg = if normal {
+			theme.text(true, selected)
+		} else {
+			theme.commit_unhighlighted()
+		};
 
 		// commit hash
 		txt.push(Span::styled(Cow::from(&*e.hash_short), style_hash));

src/components/textinput.rs

@@ -176,7 +176,7 @@ impl TextInputComponent {
 						)
 						.title(self.title.clone()),
 				);
-			};
+			}
 			text_area
 		});
 	}

src/components/utils/filetree.rs

@@ -90,7 +90,7 @@ impl FileTreeItem {
 
 		match path
 			.components()
-			.last()
+			.next_back()
 			.map(std::path::Component::as_os_str)
 			.map(OsStr::to_string_lossy)
 			.map(String::from)

src/popups/commit.rs

@@ -470,9 +470,8 @@ impl CommitPopup {
 
 		let mut msg = msg.to_owned();
 		if let (Some(user), Some(mail)) = (user, mail) {
-			msg.push_str(&format!(
-				"\n\nSigned-off-by: {user} <{mail}>"
-			));
+			use std::fmt::Write;
+			write!(msg, "\n\nSigned-off-by: {user} <{mail}>")?;
 		}
 
 		Ok(msg)

src/popups/create_remote.rs

@@ -209,6 +209,6 @@ impl CreateRemotePopup {
 
 				self.hide();
 			}
-		};
+		}
 	}
 }

src/popups/file_revlog.rs

@@ -521,7 +521,7 @@ impl Component for FileRevlogPopup {
 								InspectCommitOpen::new(commit_id),
 							),
 						));
-					};
+					}
 				} else if key_match(key, self.key_config.keys.blame) {
 					if let Some(open_request) =
 						self.open_request.clone()

src/popups/options.rs

@@ -207,7 +207,7 @@ impl OptionsPopup {
 						.borrow_mut()
 						.diff_hunk_lines_change(true);
 				}
-			};
+			}
 		} else {
 			match self.selection {
 				AppOption::StatusShowUntracked => {
@@ -246,7 +246,7 @@ impl OptionsPopup {
 						.borrow_mut()
 						.diff_hunk_lines_change(false);
 				}
-			};
+			}
 		}
 
 		self.queue

src/tabs/stashing.rs

@@ -245,7 +245,7 @@ impl Component for Stashing {
 				} else {
 					Ok(EventState::NotConsumed)
 				};
-			};
+			}
 		}
 
 		Ok(EventState::NotConsumed)

src/tabs/stashlist.rs

@@ -102,7 +102,7 @@ impl StashList {
 			Action::StashDrop(ids) => self.drop(repo, ids)?,
 			Action::StashPop(id) => self.pop(repo, *id)?,
 			_ => (),
-		};
+		}
 
 		Ok(())
 	}

src/tabs/status.rs

@@ -348,7 +348,7 @@ impl Status {
 
 					self.diff.focus(true);
 				}
-			};
+			}
 
 			self.update_diff()?;
 

src/ui/scrollbar.rs

@@ -49,7 +49,7 @@ impl Scrollbar {
 		let right = area.right().saturating_sub(1);
 		if right <= area.left() {
 			return;
-		};
+		}
 
 		let (bar_top, bar_height) = {
 			let scrollbar_area = area.inner(Margin {
@@ -86,7 +86,7 @@ impl Scrollbar {
 		let bottom = area.bottom().saturating_sub(1);
 		if bottom <= area.top() {
 			return;
-		};
+		}
 
 		let (bar_left, bar_width) = {
 			let scrollbar_area = area.inner(Margin {