@@ -195,11 +195,11 @@ impl NullState {
195195 . zip ( group_indices. iter ( ) )
196196 . zip ( values. iter ( ) )
197197 . for_each ( |( ( filter_value, & group_index) , new_value) | {
198- if let Some ( true ) = filter_value {
199- if let Some ( new_value) = new_value {
200- seen_values . set_bit ( group_index , true ) ;
201- value_fn ( group_index, new_value )
202- }
198+ if let Some ( true ) = filter_value
199+ && let Some ( new_value) = new_value
200+ {
201+ seen_values . set_bit ( group_index, true ) ;
202+ value_fn ( group_index , new_value )
203203 }
204204 } )
205205 }
@@ -357,10 +357,10 @@ pub fn accumulate<T, F>(
357357 . zip ( group_indices. iter ( ) )
358358 . zip ( values. iter ( ) )
359359 . for_each ( |( ( filter_value, & group_index) , new_value) | {
360- if let Some ( true ) = filter_value {
361- if let Some ( new_value) = new_value {
362- value_fn ( group_index , new_value )
363- }
360+ if let Some ( true ) = filter_value
361+ && let Some ( new_value) = new_value
362+ {
363+ value_fn ( group_index , new_value )
364364 }
365365 } )
366366 }
@@ -594,7 +594,7 @@ mod test {
594594 use super :: * ;
595595
596596 use arrow:: array:: { Int32Array , UInt32Array } ;
597- use rand:: { rngs:: ThreadRng , Rng } ;
597+ use rand:: { Rng , rngs:: ThreadRng } ;
598598 use std:: collections:: HashSet ;
599599
600600 #[ test]
@@ -690,11 +690,7 @@ mod test {
690690 let values_with_nulls: Vec < Option < u32 > > = ( 0 ..num_values)
691691 . map ( |_| {
692692 let is_null = null_pct < rng. random_range ( 0.0 ..1.0 ) ;
693- if is_null {
694- None
695- } else {
696- Some ( rng. random ( ) )
697- }
693+ if is_null { None } else { Some ( rng. random ( ) ) }
698694 } )
699695 . collect ( ) ;
700696
@@ -824,18 +820,20 @@ mod test {
824820 . zip ( filter. iter ( ) )
825821 . for_each ( |( ( & group_index, value) , is_included) | {
826822 // if value passed filter
827- if let Some ( true ) = is_included {
828- if let Some ( value) = value {
829- mock . saw_value ( group_index ) ;
830- expected_values . push ( ( group_index, value ) ) ;
831- }
823+ if let Some ( true ) = is_included
824+ && let Some ( value) = value
825+ {
826+ mock . saw_value ( group_index) ;
827+ expected_values . push ( ( group_index , value ) ) ;
832828 }
833829 } ) ;
834830 }
835831 }
836832
837- assert_eq ! ( accumulated_values, expected_values,
838- "\n \n accumulated_values:{accumulated_values:#?}\n \n expected_values:{expected_values:#?}" ) ;
833+ assert_eq ! (
834+ accumulated_values, expected_values,
835+ "\n \n accumulated_values:{accumulated_values:#?}\n \n expected_values:{expected_values:#?}"
836+ ) ;
839837 let seen_values = null_state. seen_values . finish_cloned ( ) ;
840838 mock. validate_seen_values ( & seen_values) ;
841839
@@ -895,8 +893,10 @@ mod test {
895893 }
896894 }
897895
898- assert_eq ! ( accumulated_values, expected_values,
899- "\n \n accumulated_values:{accumulated_values:#?}\n \n expected_values:{expected_values:#?}" ) ;
896+ assert_eq ! (
897+ accumulated_values, expected_values,
898+ "\n \n accumulated_values:{accumulated_values:#?}\n \n expected_values:{expected_values:#?}"
899+ ) ;
900900 }
901901
902902 /// This is effectively a different implementation of
@@ -940,18 +940,20 @@ mod test {
940940 . zip ( filter. iter ( ) )
941941 . for_each ( |( ( & group_index, value) , is_included) | {
942942 // if value passed filter
943- if let Some ( true ) = is_included {
944- if let Some ( value) = value {
945- mock . saw_value ( group_index ) ;
946- expected_values . push ( ( group_index, value ) ) ;
947- }
943+ if let Some ( true ) = is_included
944+ && let Some ( value) = value
945+ {
946+ mock . saw_value ( group_index) ;
947+ expected_values . push ( ( group_index , value ) ) ;
948948 }
949949 } ) ;
950950 }
951951 }
952952
953- assert_eq ! ( accumulated_values, expected_values,
954- "\n \n accumulated_values:{accumulated_values:#?}\n \n expected_values:{expected_values:#?}" ) ;
953+ assert_eq ! (
954+ accumulated_values, expected_values,
955+ "\n \n accumulated_values:{accumulated_values:#?}\n \n expected_values:{expected_values:#?}"
956+ ) ;
955957
956958 let seen_values = null_state. seen_values . finish_cloned ( ) ;
957959 mock. validate_seen_values ( & seen_values) ;
0 commit comments