fix(collapsible-if): collapse nested if in substitute_oeq_class per clippy

Author: kosiew

datafusion/physical-expr/src/equivalence/properties/mod.rs

@@ -855,18 +855,13 @@ impl EquivalenceProperties {
                             }
                         } else if let Some(cast_col) =
                             r_expr.as_any().downcast_ref::<CastColumnExpr>()
+                            && cast_col.expr().eq(&sort_expr.expr)
+                            && CastExpr::check_bigger_cast(
+                                cast_col.target_field().data_type(),
+                                &expr_type,
+                            )
                         {
-                            if cast_col.expr().eq(&sort_expr.expr)
-                                && CastExpr::check_bigger_cast(
-                                    cast_col.target_field().data_type(),
-                                    &expr_type,
-                                )
-                            {
-                                result.push(PhysicalSortExpr::new(
-                                    r_expr,
-                                    sort_expr.options,
-                                ));
-                            }
+                            result.push(PhysicalSortExpr::new(r_expr, sort_expr.options));
                         }
                     }
                     result.push(sort_expr);

datafusion/proto/src/physical_plan/from_proto.rs

@@ -1070,20 +1070,20 @@ mod tests {
             };
 
             // Try to test different strings, but skip if cache fills up
-            if format_options_from_proto(&second).is_ok() {
-                if let Ok(second_interned) = intern_format_strings(&second) {
-                    assert!(
-                        !std::ptr::eq(first_interned.null, second_interned.null),
-                        "Different null strings should return different pointers"
-                    );
-                    assert!(
-                        !std::ptr::eq(
-                            first_interned.date_format.unwrap(),
-                            second_interned.date_format.unwrap()
-                        ),
-                        "Different date_format strings should return different pointers"
-                    );
-                }
+            if format_options_from_proto(&second).is_ok()
+                && let Ok(second_interned) = intern_format_strings(&second)
+            {
+                assert!(
+                    !std::ptr::eq(first_interned.null, second_interned.null),
+                    "Different null strings should return different pointers"
+                );
+                assert!(
+                    !std::ptr::eq(
+                        first_interned.date_format.unwrap(),
+                        second_interned.date_format.unwrap()
+                    ),
+                    "Different date_format strings should return different pointers"
+                );
             }
         }
     }