File tree Expand file tree Collapse file tree 8 files changed +23
-23
lines changed Expand file tree Collapse file tree 8 files changed +23
-23
lines changed Original file line number Diff line number Diff line change @@ -715,13 +715,13 @@ mod tests_branches {
715
715
& root. as_os_str ( ) . to_str ( ) . unwrap ( ) . into ( ) ;
716
716
717
717
let branch_name = "master" ;
718
- let upstrem_merge = "refs/heads/master" ;
718
+ let upstream_merge = "refs/heads/master" ;
719
719
720
720
let mut config = repo. config ( ) . unwrap ( ) ;
721
721
config
722
722
. set_str (
723
723
& format ! ( "branch.{branch_name}.merge" ) ,
724
- upstrem_merge ,
724
+ upstream_merge ,
725
725
)
726
726
. expect ( "fail set branch merge config" ) ;
727
727
@@ -732,7 +732,7 @@ mod tests_branches {
732
732
. is_ok_and( |v| v. as_ref( ) . is_some( ) ) ) ;
733
733
assert_eq ! (
734
734
& upstream_merge_res. unwrap( ) . unwrap( ) ,
735
- upstrem_merge
735
+ upstream_merge
736
736
) ;
737
737
}
738
738
}
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ pub fn push_branch(
134
134
)
135
135
}
136
136
137
- //TODO: clenaup
137
+ //TODO: cleanup
138
138
#[ allow( clippy:: too_many_arguments) ]
139
139
pub fn push_raw (
140
140
repo_path : & RepoPath ,
Original file line number Diff line number Diff line change @@ -611,10 +611,10 @@ mod tests {
611
611
612
612
tree. collapse ( 1 , false ) ;
613
613
614
- let visibles = get_visible ( & tree) ;
614
+ let visible = get_visible ( & tree) ;
615
615
616
616
assert_eq ! (
617
- visibles ,
617
+ visible ,
618
618
vec![
619
619
true , //
620
620
true , //
@@ -625,10 +625,10 @@ mod tests {
625
625
626
626
tree. expand ( 1 , false ) ;
627
627
628
- let visibles = get_visible ( & tree) ;
628
+ let visible = get_visible ( & tree) ;
629
629
630
630
assert_eq ! (
631
- visibles ,
631
+ visible ,
632
632
vec![
633
633
true , //
634
634
true , //
@@ -699,10 +699,10 @@ mod tests {
699
699
700
700
tree. collapse ( 0 , false ) ;
701
701
702
- let visibles = get_visible ( & tree) ;
702
+ let visible = get_visible ( & tree) ;
703
703
704
704
assert_eq ! (
705
- visibles ,
705
+ visible ,
706
706
vec![
707
707
true , //
708
708
false , //
@@ -729,10 +729,10 @@ mod tests {
729
729
730
730
tree. collapse ( 1 , false ) ;
731
731
732
- let visibles = get_visible ( & tree) ;
732
+ let visible = get_visible ( & tree) ;
733
733
734
734
assert_eq ! (
735
- visibles ,
735
+ visible ,
736
736
vec![
737
737
true , //
738
738
true , //
@@ -743,10 +743,10 @@ mod tests {
743
743
744
744
tree. collapse ( 0 , false ) ;
745
745
746
- let visibles = get_visible ( & tree) ;
746
+ let visible = get_visible ( & tree) ;
747
747
748
748
assert_eq ! (
749
- visibles ,
749
+ visible ,
750
750
vec![
751
751
true , //
752
752
false , //
Original file line number Diff line number Diff line change @@ -372,7 +372,7 @@ exit 0
372
372
}
373
373
374
374
#[ test]
375
- fn test_other_path_precendence ( ) {
375
+ fn test_other_path_precedence ( ) {
376
376
let ( td, repo) = repo_init ( ) ;
377
377
378
378
{
@@ -493,7 +493,7 @@ exit 1
493
493
fn test_pre_commit_py ( ) {
494
494
let ( _td, repo) = repo_init ( ) ;
495
495
496
- // mirror how python pre-commmit sets itself up
496
+ // mirror how python pre-commit sets itself up
497
497
#[ cfg( not( windows) ) ]
498
498
let hook = b"#!/usr/bin/env python
499
499
import sys
@@ -514,7 +514,7 @@ sys.exit(0)
514
514
fn test_pre_commit_fail_py ( ) {
515
515
let ( _td, repo) = repo_init ( ) ;
516
516
517
- // mirror how python pre-commmit sets itself up
517
+ // mirror how python pre-commit sets itself up
518
518
#[ cfg( not( windows) ) ]
519
519
let hook = b"#!/usr/bin/env python
520
520
import sys
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ fn exec_copy_with_args(
50
50
}
51
51
52
52
// 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
54
54
// based on this comment: https://github.com/microsoft/WSL/issues/423#issuecomment-221627364
55
55
#[ cfg( all( target_family = "unix" , not( target_os = "macos" ) ) ) ]
56
56
fn is_wsl ( ) -> bool {
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ impl ExternalEditorPopup {
82
82
83
83
// deal with "editor name with spaces" p1 p2 p3
84
84
// and with "editor_no_spaces" p1 p2 p3
85
- // does not address spaces in pn
85
+ // does not address spaces in on
86
86
let mut echars = editor. chars ( ) . peekable ( ) ;
87
87
88
88
let first_char = * echars. peek ( ) . ok_or_else ( || {
Original file line number Diff line number Diff line change @@ -317,8 +317,8 @@ impl SubmodulesListPopup {
317
317
}
318
318
319
319
fn set_selection ( & mut self , selection : u16 ) -> Result < ( ) > {
320
- let num_entriess : u16 = self . submodules . len ( ) . try_into ( ) ?;
321
- let num_entries = num_entriess . saturating_sub ( 1 ) ;
320
+ let num_entries : u16 = self . submodules . len ( ) . try_into ( ) ?;
321
+ let num_entries = num_entries . saturating_sub ( 1 ) ;
322
322
323
323
let selection = if selection > num_entries {
324
324
num_entries
Original file line number Diff line number Diff line change @@ -460,7 +460,7 @@ impl TagListPopup {
460
460
EMPTY_SYMBOL
461
461
} ;
462
462
463
- let has_attachement_str = if tag. annotation . is_some ( ) {
463
+ let has_attachment_str = if tag. annotation . is_some ( ) {
464
464
ATTACHMENT_SYMBOL
465
465
} else {
466
466
EMPTY_SYMBOL
@@ -475,7 +475,7 @@ impl TagListPopup {
475
475
. style( self . theme. commit_time( false ) ) ,
476
476
Cell :: from( tag. author. clone( ) )
477
477
. style( self . theme. commit_author( false ) ) ,
478
- Cell :: from( has_attachement_str )
478
+ Cell :: from( has_attachment_str )
479
479
. style( self . theme. text_danger( ) ) ,
480
480
Cell :: from( tag. message. clone( ) )
481
481
. style( self . theme. text( true , false ) ) ,
You can’t perform that action at this time.
0 commit comments