fix latest clippy (#2597)

Author: extrawurst

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)
 }

asyncgit/src/sync/commit.rs

@@ -55,7 +55,6 @@ pub fn amend(
 /// Wrap `Repository::signature` to allow unknown user.name.
 ///
 /// See <https://github.com/gitui-org/gitui/issues/79>.
-#[allow(clippy::redundant_pub_crate)]
 pub(crate) fn signature_allow_undefined_name(
 	repo: &Repository,
 ) -> std::result::Result<Signature<'_>, git2::Error> {

asyncgit/src/sync/remotes/push.rs

@@ -17,6 +17,7 @@ use crate::{
 use crossbeam_channel::Sender;
 use git2::{PackBuilderStage, PushOptions};
 use scopetime::scope_time;
+use std::fmt::Write as _;
 
 ///
 pub trait AsyncProgress: Clone + Send + Sync {
@@ -182,7 +183,7 @@ 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}"));
+			let _ = write!(push_ref, ":{branch_upstream_merge}");
 		}
 	}
 

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/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

@@ -115,6 +115,10 @@ impl CommitList {
 	}
 
 	///
+	#[expect(
+		clippy::missing_const_for_fn,
+		reason = "as of 1.86.0 clippy wants this to be const even though that breaks"
+	)]
 	pub fn marked(&self) -> &[(usize, CommitId)] {
 		&self.marked
 	}

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)