fix lints, msrv

Author: adriangb

datafusion/core/tests/memory_limit/mod.rs

@@ -255,7 +255,7 @@ async fn sort_preserving_merge() {
                 "| plan_type     | plan                                                                                                                     |",
                 "+---------------+--------------------------------------------------------------------------------------------------------------------------+",
                 "| logical_plan  | Sort: t.a ASC NULLS LAST, t.b ASC NULLS LAST, fetch=10                                                                   |",
-                "|               |   TableScan: t projection=[a, b]                                                                                         |",
+                "|               |   TableScan: t projection=[a, b] preferred_ordering=[t.a ASC NULLS LAST, t.b ASC NULLS LAST]                             |",
                 "| physical_plan | SortPreservingMergeExec: [a@0 ASC NULLS LAST, b@1 ASC NULLS LAST], fetch=10                                              |",
                 "|               |   DataSourceExec: partitions=2, partition_sizes=[5, 5], fetch=10, output_ordering=a@0 ASC NULLS LAST, b@1 ASC NULLS LAST |",
                 "|               |                                                                                                                          |",
@@ -303,7 +303,7 @@ async fn sort_spill_reservation() {
                 "| plan_type     | plan                                                                                                        |",
                 "+---------------+-------------------------------------------------------------------------------------------------------------+",
                 "| logical_plan  | Sort: t.a ASC NULLS LAST, t.b DESC NULLS FIRST                                                              |",
-                "|               |   TableScan: t projection=[a, b]                                                                            |",
+                "|               |   TableScan: t projection=[a, b] preferred_ordering=[t.a ASC NULLS LAST, t.b DESC NULLS FIRST]              |",
                 "| physical_plan | SortExec: expr=[a@0 ASC NULLS LAST, b@1 DESC], preserve_partitioning=[false]                                |",
                 "|               |   DataSourceExec: partitions=1, partition_sizes=[5], output_ordering=a@0 ASC NULLS LAST, b@1 ASC NULLS LAST |",
                 "|               |                                                                                                             |",

datafusion/optimizer/src/push_down_sort.rs

@@ -284,8 +284,7 @@ impl OptimizerRule for PushDownSort {
                 }
             }
         })
-        .map(|transformed_ctx| transformed_ctx.map_data(|ctx| Ok(ctx.plan)))
-        .flatten()
+        .and_then(|transformed_ctx| transformed_ctx.map_data(|ctx| Ok(ctx.plan)))
     }
 
     fn name(&self) -> &str {