@@ -134,7 +134,7 @@ impl<T: Clone> MergeState<T> {
134134 breakout = Some ( Breakout :: Succeed ) ;
135135 break ;
136136 }
137- k = gallop_left ( & values, is_lt, & self . buf [ cursor_a] , cursor_b, len_b, 0 ) ?;
137+ k = gallop_left ( values, is_lt, & self . buf [ cursor_a] , cursor_b, len_b, 0 ) ?;
138138 b_count = k;
139139 if k > 0 {
140140 copy_within_clone ( values, cursor_b, dest, k) ;
@@ -208,7 +208,7 @@ impl<T: Clone> MergeState<T> {
208208 len_a -= 1 ;
209209
210210 if len_a == 0 {
211- values[ dest - len_b + 1 .. dest + 1 ] . clone_from_slice ( & self . buf [ 0 ..len_b] ) ;
211+ values[ ( dest - len_b + 1 ) ..= dest] . clone_from_slice ( & self . buf [ 0 ..len_b] ) ;
212212 return Ok ( ( ) ) ;
213213 }
214214 if len_b == 1 {
@@ -272,7 +272,7 @@ impl<T: Clone> MergeState<T> {
272272 }
273273 self . min_gallop = min_gallop;
274274 let mut k = gallop_right (
275- & values,
275+ values,
276276 is_lt,
277277 & self . buf [ cursor_b] ,
278278 start_a,
@@ -303,8 +303,8 @@ impl<T: Clone> MergeState<T> {
303303 k = len_b - k;
304304 b_count = k;
305305 if k > 0 {
306- values[ dest + 1 - k..dest + 1 ]
307- . clone_from_slice ( & self . buf [ cursor_b + 1 - k..cursor_b + 1 ] ) ;
306+ values[ dest + 1 - k..= dest]
307+ . clone_from_slice ( & self . buf [ cursor_b + 1 - k..= cursor_b] ) ;
308308 dest -= k;
309309 len_b -= k;
310310
@@ -344,7 +344,7 @@ impl<T: Clone> MergeState<T> {
344344 match breakout {
345345 Some ( Breakout :: Succeed ) => {
346346 if len_b > 0 {
347- values[ ( dest + 1 ) - len_b..dest + 1 ] . clone_from_slice ( & self . buf [ 0 ..len_b] ) ;
347+ values[ ( dest + 1 ) - len_b..= dest] . clone_from_slice ( & self . buf [ 0 ..len_b] ) ;
348348 }
349349 Ok ( ( ) )
350350 }
@@ -407,7 +407,12 @@ impl<T: Clone> MergeState<T> {
407407 Ok ( ( ) )
408408 }
409409
410- fn found_new_run < E , F > ( & mut self , new_run_len : usize , values : & mut [ T ] , is_lt : & mut F ) -> Result < ( ) , E >
410+ fn found_new_run < E , F > (
411+ & mut self ,
412+ new_run_len : usize ,
413+ values : & mut [ T ] ,
414+ is_lt : & mut F ,
415+ ) -> Result < ( ) , E >
411416 where
412417 F : FnMut ( & T , & T ) -> Result < bool , E > ,
413418 {
@@ -661,7 +666,7 @@ where
661666 }
662667
663668 if n < MAX_MINRUN {
664- let ( l, desc) = count_run ( & values, is_lt) ?;
669+ let ( l, desc) = count_run ( values, is_lt) ?;
665670 if desc {
666671 values[ 0 ..l] . reverse ( ) ;
667672 }
@@ -721,14 +726,14 @@ mod tests {
721726
722727 #[ test]
723728 fn test_large ( ) {
724- let mut v: Vec < i32 > = ( 0 ..1000 ) . rev ( ) . collect ( ) ; // 999..0
729+ let v: Vec < i32 > = ( 0 ..1000 ) . rev ( ) . collect ( ) ; // 999..0
725730 let sorted: Vec < i32 > = ( 0 ..1000 ) . collect ( ) ;
726731 assert_eq ! ( sort( v) , sorted) ;
727732 }
728733
729734 #[ test]
730735 fn test_random_ish ( ) {
731- let mut v: Vec < i32 > = ( 0 ..500 ) . map ( |i| ( i * 7919 ) % 500 ) . collect ( ) ;
736+ let v: Vec < i32 > = ( 0 ..500 ) . map ( |i| ( i * 7919 ) % 500 ) . collect ( ) ;
732737 let mut expected = v. clone ( ) ;
733738 expected. sort ( ) ;
734739 assert_eq ! ( sort( v) , expected) ;
0 commit comments