fix(manual_is_variant): Skip old versions

changelog: [`manual_is_variant`]: skip the check when the MSRV is before
1.70

Author: ceptontech

clippy_lints/src/methods/manual_is_variant_and.rs

@@ -190,7 +190,10 @@ fn emit_lint<'tcx>(
     );
 }
 
-pub(super) fn check_map(cx: &LateContext<'_>, expr: &Expr<'_>) {
+pub(super) fn check_map(cx: &LateContext<'_>, expr: &Expr<'_>, msrv: Msrv) {
+    if !msrv.meets(cx, msrvs::OPTION_RESULT_IS_VARIANT_AND) {
+        return;
+    }
     if let Some(parent_expr) = get_parent_expr(cx, expr)
         && let ExprKind::Binary(op, left, right) = parent_expr.kind
         && op.span.eq_ctxt(expr.span)

clippy_lints/src/methods/mod.rs

@@ -5340,7 +5340,7 @@ impl Methods {
                     if name == sym::map {
                         map_clone::check(cx, expr, recv, m_arg, self.msrv);
                         map_with_unused_argument_over_ranges::check(cx, expr, recv, m_arg, self.msrv, span);
-                        manual_is_variant_and::check_map(cx, expr);
+                        manual_is_variant_and::check_map(cx, expr, self.msrv);
                         match method_call(recv) {
                             Some((map_name @ (sym::iter | sym::into_iter), recv2, _, _, _)) => {
                                 iter_kv_map::check(cx, map_name, expr, recv2, m_arg, self.msrv);

tests/ui/manual_is_variant_and.fixed

@@ -50,6 +50,7 @@ macro_rules! mac {
 
 #[clippy::msrv = "1.69"]
 fn under_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.map(|x| x != 0) == Ok(true);
     let _ = res.into_iter().any(|x| x != 0);
     let _ = opt.map(|x| x != 0).unwrap_or_default();
     let _ = opt.iter().all(|x| *x != 0);
@@ -58,6 +59,8 @@ fn under_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
 
 #[clippy::msrv = "1.70"]
 fn meets_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.is_ok_and(|x| x != 0);
+    //~^ manual_is_variant_and
     let _ = res.is_ok_and(|x| x != 0);
     //~^ manual_is_variant_and
     let _ = opt.is_some_and(|x| x != 0);
@@ -69,6 +72,8 @@ fn meets_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
 
 #[clippy::msrv = "1.81"]
 fn under_msrv_is_none_or(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.is_ok_and(|x| x != 0);
+    //~^ manual_is_variant_and
     let _ = res.is_ok_and(|x| x != 0);
     //~^ manual_is_variant_and
     let _ = opt.is_some_and(|x| x != 0);
@@ -80,6 +85,8 @@ fn under_msrv_is_none_or(opt: Option<u32>, res: Result<u32, ()>) {
 
 #[clippy::msrv = "1.82"]
 fn meets_msrv_is_none_or(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.is_ok_and(|x| x != 0);
+    //~^ manual_is_variant_and
     let _ = res.is_ok_and(|x| x != 0);
     //~^ manual_is_variant_and
     let _ = opt.is_some_and(|x| x != 0);

tests/ui/manual_is_variant_and.rs

@@ -50,6 +50,7 @@ macro_rules! mac {
 
 #[clippy::msrv = "1.69"]
 fn under_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.map(|x| x != 0) == Ok(true);
     let _ = res.into_iter().any(|x| x != 0);
     let _ = opt.map(|x| x != 0).unwrap_or_default();
     let _ = opt.iter().all(|x| *x != 0);
@@ -58,6 +59,8 @@ fn under_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
 
 #[clippy::msrv = "1.70"]
 fn meets_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.map(|x| x != 0) == Ok(true);
+    //~^ manual_is_variant_and
     let _ = res.into_iter().any(|x| x != 0);
     //~^ manual_is_variant_and
     let _ = opt.map(|x| x != 0).unwrap_or_default();
@@ -69,6 +72,8 @@ fn meets_msrv_is_some_and(opt: Option<u32>, res: Result<u32, ()>) {
 
 #[clippy::msrv = "1.81"]
 fn under_msrv_is_none_or(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.map(|x| x != 0) == Ok(true);
+    //~^ manual_is_variant_and
     let _ = res.into_iter().any(|x| x != 0);
     //~^ manual_is_variant_and
     let _ = opt.map(|x| x != 0).unwrap_or_default();
@@ -80,6 +85,8 @@ fn under_msrv_is_none_or(opt: Option<u32>, res: Result<u32, ()>) {
 
 #[clippy::msrv = "1.82"]
 fn meets_msrv_is_none_or(opt: Option<u32>, res: Result<u32, ()>) {
+    let _ = res.map(|x| x != 0) == Ok(true);
+    //~^ manual_is_variant_and
     let _ = res.into_iter().any(|x| x != 0);
     //~^ manual_is_variant_and
     let _ = opt.map(|x| x != 0).unwrap_or_default();