simplify call_max_min even further

Author: Xaeroxe

clippy_lints/src/manual_clamp.rs

@@ -305,23 +305,14 @@ fn is_call_max_min_pattern<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>)
         OrdOrFloat(&'tcx PathSegment<'tcx>),
     }
 
-    fn extract_call_data(e: ExprRef<'_>, is_first: bool) -> Option<(ExprRef<'_>, ExprRef<'_>, ExprRef<'_>, bool)> {
-        if let ExprKind::Call(inner_fn, &[ref third, ref fourth]) = &e.kind {
-            Some((inner_fn, third, fourth, is_first))
-        } else {
-            None
-        }
-    }
-
     fn check<'tcx>(
         cx: &LateContext<'tcx>,
         outer_fn: ExprRef<'tcx>,
         first: ExprRef<'tcx>,
         second: ExprRef<'tcx>,
         span: Span,
     ) -> Option<ClampSuggestion<'tcx>> {
-        if let Ok((inner_fn, third, fourth, is_first)) =
-            extract_call_data(first, true).into_iter().chain(extract_call_data(second, false)).exactly_one()
+        if let ExprKind::Call(inner_fn, &[ref third, ref fourth]) = &first.kind
         && let Some(inner_seg) = segment(cx, inner_fn)
         && let Some(outer_seg) = segment(cx, outer_fn) {
             let third_is_const = constant(cx, cx.typeck_results(), simplify_kind(third)).is_some();
@@ -333,11 +324,7 @@ fn is_call_max_min_pattern<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>)
                 (false, true) => (input, new_arg) = (third, fourth),
                 _ => return None,
             }
-            let other_new_arg = if is_first {
-                second
-            } else {
-                first
-            };
+            let other_new_arg = second;
             let is_float = cx.typeck_results().expr_ty_adjusted(input).is_floating_point();
             let min_max_suggestion = Some(ClampSuggestion {
                 params: InputMinMax { input, min: other_new_arg, max: new_arg, is_float },