Fix clippy

Signed-off-by: Adam Gutglick <[email protected]>

Author: AdamGS

vortex-datafusion/src/convert/exprs.rs

@@ -32,15 +32,16 @@ pub(crate) fn make_vortex_predicate(
         .iter()
         .filter_map(|e| {
             if is_dynamic_physical_expr(e) {
-                let e = snapshot_physical_expr(e.clone()).expect("do");
-                match Expression::try_from_df(e.as_ref()) {
-                    Ok(e) => Some(Ok(e)),
-                    Err(_) => {
-                        // If we fail to convert the expression to Vortex, its safe
-                        // to drop it as we don't declare it as pushed down
-                        None
+                snapshot_physical_expr(e.clone()).ok().and_then(|e| {
+                    match Expression::try_from_df(e.as_ref()) {
+                        Ok(e) => Some(Ok(e)),
+                        Err(_) => {
+                            // If we fail to convert the expression to Vortex, its safe
+                            // to drop it as we don't declare it as pushed down
+                            None
+                        }
                     }
-                }
+                })
             } else {
                 Some(Expression::try_from_df(e.as_ref()))
             }

vortex-datafusion/src/persistent/opener.rs

@@ -295,11 +295,11 @@ impl FileOpener for VortexOpener {
                 .and_then(|f| {
                     let exprs = split_conjunction(&f)
                         .into_iter()
-                        .cloned()
                         .filter(|expr| {
                             is_dynamic_physical_expr(expr)
                                 || can_be_pushed_down(expr, &predicate_file_schema)
                         })
+                        .cloned()
                         .collect::<Vec<_>>();
 
                     make_vortex_predicate(&exprs).transpose()