File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -222,8 +222,7 @@ impl ResultSet {
222222 | ( Some ( Kind :: ListValue ( _) ) , Some ( Kind :: ListValue ( _) ) )
223223 ) ;
224224 if mergeable {
225- let merged =
226- ResultSet :: merge ( last_value_of_previous, first_value_of_current) ?;
225+ let merged = ResultSet :: merge ( last_value_of_previous, first_value_of_current) ?;
227226 last. values . push ( merged) ;
228227 } else {
229228 last. values . push ( last_value_of_previous) ;
@@ -660,9 +659,15 @@ mod tests {
660659 // mismatch ...`. After the fix it must concatenate without merging.
661660 #[ test]
662661 fn test_rs_merge_list_value_with_non_mergeable_tail ( ) {
663- let null = || Value { kind : Some ( Kind :: NullValue ( prost_types:: NullValue :: NullValue . into ( ) ) ) } ;
664- let bool_v = |b : bool | Value { kind : Some ( Kind :: BoolValue ( b) ) } ;
665- let num_v = |n : f64 | Value { kind : Some ( Kind :: NumberValue ( n) ) } ;
662+ let null = || Value {
663+ kind : Some ( Kind :: NullValue ( prost_types:: NullValue :: NullValue . into ( ) ) ) ,
664+ } ;
665+ let bool_v = |b : bool | Value {
666+ kind : Some ( Kind :: BoolValue ( b) ) ,
667+ } ;
668+ let num_v = |n : f64 | Value {
669+ kind : Some ( Kind :: NumberValue ( n) ) ,
670+ } ;
666671
667672 // previous tail = NullValue, source first = StringValue: must NOT merge.
668673 let previous_last = Value {
You can’t perform that action at this time.
0 commit comments