File tree Expand file tree Collapse file tree 6 files changed +12
-12
lines changed Expand file tree Collapse file tree 6 files changed +12
-12
lines changed Original file line number Diff line number Diff 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}
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ pub fn push_branch(
134134 )
135135}
136136
137- //TODO: clenaup
137+ //TODO: cleanup
138138#[ allow( clippy:: too_many_arguments) ]
139139pub fn push_raw (
140140 repo_path : & RepoPath ,
Original file line number Diff line number Diff 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
499499import 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
520520import sys
Original file line number Diff line number Diff 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" ) ) ) ]
5656fn is_wsl ( ) -> bool {
Original file line number Diff line number Diff line change @@ -317,8 +317,8 @@ impl SubmodulesListPopup {
317317 }
318318
319319 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 ) ;
322322
323323 let selection = if selection > num_entries {
324324 num_entries
Original file line number Diff line number Diff 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 ) ) ,
You can’t perform that action at this time.
0 commit comments