Merge branch 'master' into add-ai-commit-message-helper

Author: extrawurst

.github/dependabot.yml

@@ -6,5 +6,11 @@ updates:
     interval: daily
   open-pull-requests-limit: 10
   groups:
-    cargo:
+    cargo-minor:
       patterns: ["*"]
+      update-types:
+        - 'minor'
+    cargo-patch:
+      patterns: ["*"]
+      update-types:
+        - 'patch'

asyncgit/src/sync/config.rs

@@ -8,23 +8,18 @@ use super::{repository::repo, RepoPath};
 // see https://git-scm.com/docs/git-config#Documentation/git-config.txt-statusshowUntrackedFiles
 /// represents the `status.showUntrackedFiles` git config state
 #[derive(
-	Hash, Copy, Clone, PartialEq, Eq, Serialize, Deserialize,
+	Hash, Copy, Clone, Default, PartialEq, Eq, Serialize, Deserialize,
 )]
 pub enum ShowUntrackedFilesConfig {
 	///
+	#[default]
 	No,
 	///
 	Normal,
 	///
 	All,
 }
 
-impl Default for ShowUntrackedFilesConfig {
-	fn default() -> Self {
-		Self::No
-	}
-}
-
 impl ShowUntrackedFilesConfig {
 	///
 	pub const fn include_none(self) -> bool {
@@ -68,21 +63,16 @@ pub fn untracked_files_config_repo(
 
 // see https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushdefault
 /// represents `push.default` git config
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Default, Eq)]
 pub enum PushDefaultStrategyConfig {
 	Nothing,
 	Current,
 	Upstream,
+	#[default]
 	Simple,
 	Matching,
 }
 
-impl Default for PushDefaultStrategyConfig {
-	fn default() -> Self {
-		Self::Simple
-	}
-}
-
 impl<'a> TryFrom<&'a str> for PushDefaultStrategyConfig {
 	type Error = crate::Error;
 	fn try_from(

asyncgit/src/sync/diff.rs

@@ -22,9 +22,10 @@ use serde::{Deserialize, Serialize};
 use std::{cell::RefCell, fs, path::Path, rc::Rc};
 
 /// type of diff of a single line
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
+#[derive(Copy, Clone, Default, PartialEq, Eq, Hash, Debug)]
 pub enum DiffLineType {
 	/// just surrounding line, no change
+	#[default]
 	None,
 	/// header of the hunk
 	Header,
@@ -47,12 +48,6 @@ impl From<git2::DiffLineType> for DiffLineType {
 	}
 }
 
-impl Default for DiffLineType {
-	fn default() -> Self {
-		Self::None
-	}
-}
-
 ///
 #[derive(Default, Clone, Hash, Debug)]
 pub struct DiffLine {

asyncgit/src/sync/remotes/push.rs

@@ -98,20 +98,15 @@ impl AsyncProgress for ProgressNotification {
 }
 
 ///
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub enum PushType {
 	///
+	#[default]
 	Branch,
 	///
 	Tag,
 }
 
-impl Default for PushType {
-	fn default() -> Self {
-		Self::Branch
-	}
-}
-
 #[cfg(test)]
 pub fn push_branch(
 	repo_path: &RepoPath,

asyncgit/src/sync/status.rs

@@ -104,22 +104,17 @@ pub struct StatusItem {
 }
 
 ///
-#[derive(Copy, Clone, Hash, PartialEq, Eq, Debug)]
+#[derive(Copy, Clone, Default, Hash, PartialEq, Eq, Debug)]
 pub enum StatusType {
 	///
+	#[default]
 	WorkingDir,
 	///
 	Stage,
 	///
 	Both,
 }
 
-impl Default for StatusType {
-	fn default() -> Self {
-		Self::WorkingDir
-	}
-}
-
 impl From<StatusType> for StatusShow {
 	fn from(s: StatusType) -> Self {
 		match s {

git2-hooks/src/hookspath.rs

@@ -146,7 +146,11 @@ impl HookPaths {
 		S: AsRef<OsStr>,
 	{
 		let hook = self.hook.clone();
-		log::trace!("run hook '{:?}' in '{:?}'", hook, self.pwd);
+		log::trace!(
+			"run hook '{}' in '{}'",
+			hook.display(),
+			self.pwd.display()
+		);
 
 		let run_command = |command: &mut Command| {
 			command
@@ -250,7 +254,7 @@ fn is_executable(path: &Path) -> bool {
 	let metadata = match path.metadata() {
 		Ok(metadata) => metadata,
 		Err(e) => {
-			log::error!("metadata error: {}", e);
+			log::error!("metadata error: {e}");
 			return false;
 		}
 	};

src/cmdbar.rs

@@ -104,7 +104,7 @@ impl CommandBar {
 			line_width += entry_w + 1;
 
 			self.draw_list.push(DrawListEntry::Command(Command {
-				txt: c.text.name.to_string(),
+				txt: c.text.name.clone(),
 				enabled: c.enabled,
 				line: lines.saturating_sub(1) as usize,
 			}));

src/main.rs

@@ -44,11 +44,9 @@
 	clippy::unwrap_used,
 	clippy::filetype_is_file,
 	clippy::cargo,
-	clippy::unwrap_used,
 	clippy::panic,
 	clippy::match_like_matches_macro
 )]
-#![allow(clippy::module_name_repetitions)]
 #![allow(
 	clippy::multiple_crate_versions,
 	clippy::bool_to_int_with_if,

src/options.rs

@@ -133,7 +133,7 @@ impl Options {
 
 			index = entries.saturating_sub(1) - index;
 
-			Some(self.data.commit_msgs[index].to_string())
+			Some(self.data.commit_msgs[index].clone())
 		}
 	}
 

src/popups/branchlist.rs

@@ -557,7 +557,7 @@ impl BranchListPopup {
 				theme.commit_hash(selected),
 			);
 			let span_msg = Span::styled(
-				commit_message.to_string(),
+				commit_message.clone(),
 				theme.text(true, selected),
 			);
 			let span_name = Span::styled(