diff --git a/asyncgit/src/sync/branch/mod.rs b/asyncgit/src/sync/branch/mod.rs index 81ec2ec586..b813408b73 100644 --- a/asyncgit/src/sync/branch/mod.rs +++ b/asyncgit/src/sync/branch/mod.rs @@ -715,13 +715,13 @@ mod tests_branches { &root.as_os_str().to_str().unwrap().into(); let branch_name = "master"; - let upstrem_merge = "refs/heads/master"; + let upstream_merge = "refs/heads/master"; let mut config = repo.config().unwrap(); config .set_str( &format!("branch.{branch_name}.merge"), - upstrem_merge, + upstream_merge, ) .expect("fail set branch merge config"); @@ -732,7 +732,7 @@ mod tests_branches { .is_ok_and(|v| v.as_ref().is_some())); assert_eq!( &upstream_merge_res.unwrap().unwrap(), - upstrem_merge + upstream_merge ); } } diff --git a/asyncgit/src/sync/remotes/push.rs b/asyncgit/src/sync/remotes/push.rs index 0916bfdc91..fede2218a6 100644 --- a/asyncgit/src/sync/remotes/push.rs +++ b/asyncgit/src/sync/remotes/push.rs @@ -134,7 +134,7 @@ pub fn push_branch( ) } -//TODO: clenaup +//TODO: cleanup #[allow(clippy::too_many_arguments)] pub fn push_raw( repo_path: &RepoPath, diff --git a/git2-hooks/src/lib.rs b/git2-hooks/src/lib.rs index 4c949a1e46..688ddc5294 100644 --- a/git2-hooks/src/lib.rs +++ b/git2-hooks/src/lib.rs @@ -372,7 +372,7 @@ exit 0 } #[test] - fn test_other_path_precendence() { + fn test_other_path_precedence() { let (td, repo) = repo_init(); { @@ -493,7 +493,7 @@ exit 1 fn test_pre_commit_py() { let (_td, repo) = repo_init(); - // mirror how python pre-commmit sets itself up + // mirror how python pre-commit sets itself up #[cfg(not(windows))] let hook = b"#!/usr/bin/env python import sys @@ -514,7 +514,7 @@ sys.exit(0) fn test_pre_commit_fail_py() { let (_td, repo) = repo_init(); - // mirror how python pre-commmit sets itself up + // mirror how python pre-commit sets itself up #[cfg(not(windows))] let hook = b"#!/usr/bin/env python import sys diff --git a/src/clipboard.rs b/src/clipboard.rs index 3bd8b2d6fc..253fdb5953 100644 --- a/src/clipboard.rs +++ b/src/clipboard.rs @@ -50,7 +50,7 @@ fn exec_copy_with_args( } // Implementation taken from https://crates.io/crates/wsl. -// Using /proc/sys/kernel/osrelease as an authoratative source +// Using /proc/sys/kernel/osrelease as an authoritative source // based on this comment: https://github.com/microsoft/WSL/issues/423#issuecomment-221627364 #[cfg(all(target_family = "unix", not(target_os = "macos")))] fn is_wsl() -> bool { diff --git a/src/popups/submodules.rs b/src/popups/submodules.rs index 4ac1857e36..3717bfd8ed 100644 --- a/src/popups/submodules.rs +++ b/src/popups/submodules.rs @@ -317,8 +317,8 @@ impl SubmodulesListPopup { } fn set_selection(&mut self, selection: u16) -> Result<()> { - let num_entriess: u16 = self.submodules.len().try_into()?; - let num_entries = num_entriess.saturating_sub(1); + let num_entries: u16 = self.submodules.len().try_into()?; + let num_entries = num_entries.saturating_sub(1); let selection = if selection > num_entries { num_entries diff --git a/src/popups/taglist.rs b/src/popups/taglist.rs index 8acda78e89..926771c28c 100644 --- a/src/popups/taglist.rs +++ b/src/popups/taglist.rs @@ -460,7 +460,7 @@ impl TagListPopup { EMPTY_SYMBOL }; - let has_attachement_str = if tag.annotation.is_some() { + let has_attachment_str = if tag.annotation.is_some() { ATTACHMENT_SYMBOL } else { EMPTY_SYMBOL @@ -475,7 +475,7 @@ impl TagListPopup { .style(self.theme.commit_time(false)), Cell::from(tag.author.clone()) .style(self.theme.commit_author(false)), - Cell::from(has_attachement_str) + Cell::from(has_attachment_str) .style(self.theme.text_danger()), Cell::from(tag.message.clone()) .style(self.theme.text(true, false)),