Skip to content

Commit 3455059

Browse files
committed
Fix typos
Thanks to typos for finding those!
1 parent e5ebb22 commit 3455059

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ but this also allows us now to define colors in the common hex format:
7070
Checkout [THEMES.md](./THEMES.md) for more info.
7171

7272
### Added
73-
* due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separat artifact)
73+
* due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separate artifact)
7474
* support `BUILD_GIT_COMMIT_ID` enabling builds from `git archive` generated source tarballs or other outside a git repo [[@alerque](https://github.com/alerque)] ([#2187](https://github.com/gitui-org/gitui/pull/2187))
7575

7676
### Fixes
@@ -907,7 +907,7 @@ Thanks for your interest and support over this year! Read more about the 1 year
907907
- log tab refreshes when head changes ([#78](https://github.com/gitui-org/gitui/issues/78))
908908
- performance optimization of the log tab in big repos
909909
- more readable default color for the commit hash in the log tab
910-
- more error/panic resiliance (`unwrap`/`panic` denied by clippy now) [[@MCord](https://github.com/MCord)](<[#77](https://github.com/gitui-org/gitui/issues/77)>)
910+
- more error/panic resilience (`unwrap`/`panic` denied by clippy now) [[@MCord](https://github.com/MCord)](<[#77](https://github.com/gitui-org/gitui/issues/77)>)
911911

912912
### Fixes
913913

asyncgit/src/sync/branch/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -715,13 +715,13 @@ mod tests_branches {
715715
&root.as_os_str().to_str().unwrap().into();
716716

717717
let branch_name = "master";
718-
let upstrem_merge = "refs/heads/master";
718+
let upstream_merge = "refs/heads/master";
719719

720720
let mut config = repo.config().unwrap();
721721
config
722722
.set_str(
723723
&format!("branch.{branch_name}.merge"),
724-
upstrem_merge,
724+
upstream_merge,
725725
)
726726
.expect("fail set branch merge config");
727727

@@ -732,7 +732,7 @@ mod tests_branches {
732732
.is_ok_and(|v| v.as_ref().is_some()));
733733
assert_eq!(
734734
&upstream_merge_res.unwrap().unwrap(),
735-
upstrem_merge
735+
upstream_merge
736736
);
737737
}
738738
}
@@ -1017,7 +1017,7 @@ mod test_remote_branches {
10171017
}
10181018

10191019
#[test]
1020-
fn test_checkout_remote_branch_hirachical() {
1020+
fn test_checkout_remote_branch_hierarchical() {
10211021
let (r1_dir, _repo) = repo_init_bare().unwrap();
10221022

10231023
let (clone1_dir, clone1) =

asyncgit/src/sync/remotes/push.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub fn push_branch(
129129
)
130130
}
131131

132-
//TODO: clenaup
132+
//TODO: cleanup
133133
#[allow(clippy::too_many_arguments)]
134134
pub fn push_raw(
135135
repo_path: &RepoPath,

git2-hooks/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ exit 0
372372
}
373373

374374
#[test]
375-
fn test_other_path_precendence() {
375+
fn test_other_path_precedence() {
376376
let (td, repo) = repo_init();
377377

378378
{
@@ -493,7 +493,7 @@ exit 1
493493
fn test_pre_commit_py() {
494494
let (_td, repo) = repo_init();
495495

496-
// mirror how python pre-commmit sets itself up
496+
// mirror how python pre-commit sets itself up
497497
#[cfg(not(windows))]
498498
let hook = b"#!/usr/bin/env python
499499
import sys
@@ -514,7 +514,7 @@ sys.exit(0)
514514
fn test_pre_commit_fail_py() {
515515
let (_td, repo) = repo_init();
516516

517-
// mirror how python pre-commmit sets itself up
517+
// mirror how python pre-commit sets itself up
518518
#[cfg(not(windows))]
519519
let hook = b"#!/usr/bin/env python
520520
import sys

src/clipboard.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn exec_copy_with_args(
5050
}
5151

5252
// Implementation taken from https://crates.io/crates/wsl.
53-
// Using /proc/sys/kernel/osrelease as an authoratative source
53+
// Using /proc/sys/kernel/osrelease as an authoritative source
5454
// based on this comment: https://github.com/microsoft/WSL/issues/423#issuecomment-221627364
5555
#[cfg(all(target_family = "unix", not(target_os = "macos")))]
5656
fn is_wsl() -> bool {

src/input.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::notify_mutex::NotifyableMutex;
1+
use crate::notify_mutex::NotifiableMutex;
22
use anyhow::Result;
33
use crossbeam_channel::{unbounded, Receiver, Sender};
44
use crossterm::event::{self, Event, Event::Key, KeyEventKind};
@@ -31,7 +31,7 @@ pub enum InputEvent {
3131
///
3232
#[derive(Clone)]
3333
pub struct Input {
34-
desired_state: Arc<NotifyableMutex<bool>>,
34+
desired_state: Arc<NotifiableMutex<bool>>,
3535
current_state: Arc<AtomicBool>,
3636
receiver: Receiver<InputEvent>,
3737
aborted: Arc<AtomicBool>,
@@ -42,7 +42,7 @@ impl Input {
4242
pub fn new() -> Self {
4343
let (tx, rx) = unbounded();
4444

45-
let desired_state = Arc::new(NotifyableMutex::new(true));
45+
let desired_state = Arc::new(NotifiableMutex::new(true));
4646
let current_state = Arc::new(AtomicBool::new(true));
4747
let aborted = Arc::new(AtomicBool::new(false));
4848

@@ -100,7 +100,7 @@ impl Input {
100100
}
101101

102102
fn input_loop(
103-
arc_desired: &Arc<NotifyableMutex<bool>>,
103+
arc_desired: &Arc<NotifiableMutex<bool>>,
104104
arc_current: &Arc<AtomicBool>,
105105
tx: &Sender<InputEvent>,
106106
) -> Result<()> {

src/notify_mutex.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ use std::sync::{Arc, Condvar, Mutex};
22

33
/// combines a `Mutex` and `Condvar` to allow waiting for a change in the variable protected by the `Mutex`
44
#[derive(Clone, Debug)]
5-
pub struct NotifyableMutex<T>
5+
pub struct NotifiableMutex<T>
66
where
77
T: Send + Sync,
88
{
99
data: Arc<(Mutex<T>, Condvar)>,
1010
}
1111

12-
impl<T> NotifyableMutex<T>
12+
impl<T> NotifiableMutex<T>
1313
where
1414
T: Send + Sync,
1515
{

src/popups/taglist.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ impl TagListPopup {
460460
EMPTY_SYMBOL
461461
};
462462

463-
let has_attachement_str = if tag.annotation.is_some() {
463+
let has_attachment_str = if tag.annotation.is_some() {
464464
ATTACHMENT_SYMBOL
465465
} else {
466466
EMPTY_SYMBOL
@@ -475,7 +475,7 @@ impl TagListPopup {
475475
.style(self.theme.commit_time(false)),
476476
Cell::from(tag.author.clone())
477477
.style(self.theme.commit_author(false)),
478-
Cell::from(has_attachement_str)
478+
Cell::from(has_attachment_str)
479479
.style(self.theme.text_danger()),
480480
Cell::from(tag.message.clone())
481481
.style(self.theme.text(true, false)),

0 commit comments

Comments
 (0)