Skip to content

Fix typos #2649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions asyncgit/src/sync/branch/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -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
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion asyncgit/src/sync/remotes/push.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pub fn push_branch(
)
}

//TODO: clenaup
//TODO: cleanup
#[allow(clippy::too_many_arguments)]
pub fn push_raw(
repo_path: &RepoPath,
Expand Down
6 changes: 3 additions & 3 deletions git2-hooks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ exit 0
}

#[test]
fn test_other_path_precendence() {
fn test_other_path_precedence() {
let (td, repo) = repo_init();

{
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/clipboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/popups/submodules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/popups/taglist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)),
Expand Down