From e65cefcf6f22cb482bcd2ae40c99f6baab8d99bc Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Thu, 9 May 2024 11:33:53 -0400
Subject: Propagate errors rather than using return_if_err

---
 clippy_utils/src/lib.rs   | 1 +
 clippy_utils/src/sugg.rs  | 4 +++-
 clippy_utils/src/usage.rs | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'clippy_utils/src')

diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs
index a49414a058b..99d7aba2f7a 100644
--- a/clippy_utils/src/lib.rs
+++ b/clippy_utils/src/lib.rs
@@ -7,6 +7,7 @@
 #![feature(never_type)]
 #![feature(rustc_private)]
 #![feature(assert_matches)]
+#![feature(unwrap_infallible)]
 #![recursion_limit = "512"]
 #![cfg_attr(feature = "deny-warnings", deny(warnings))]
 #![allow(
diff --git a/clippy_utils/src/sugg.rs b/clippy_utils/src/sugg.rs
index 49b0eb05d2a..bf03c6c1601 100644
--- a/clippy_utils/src/sugg.rs
+++ b/clippy_utils/src/sugg.rs
@@ -830,7 +830,9 @@ pub fn deref_closure_args(cx: &LateContext<'_>, closure: &hir::Expr<'_>) -> Opti
             applicability: Applicability::MachineApplicable,
         };
 
-        ExprUseVisitor::for_clippy(cx, def_id, &mut visitor).consume_body(closure_body);
+        ExprUseVisitor::for_clippy(cx, def_id, &mut visitor)
+            .consume_body(closure_body)
+            .into_ok();
 
         if !visitor.suggestion_start.is_empty() {
             return Some(DerefClosure {
diff --git a/clippy_utils/src/usage.rs b/clippy_utils/src/usage.rs
index d0ab6d434aa..9abb4ef9b8d 100644
--- a/clippy_utils/src/usage.rs
+++ b/clippy_utils/src/usage.rs
@@ -21,7 +21,8 @@ pub fn mutated_variables<'tcx>(expr: &'tcx Expr<'_>, cx: &LateContext<'tcx>) ->
         expr.hir_id.owner.def_id,
         &mut delegate,
     )
-    .walk_expr(expr);
+    .walk_expr(expr)
+    .into_ok();
 
     if delegate.skip {
         return None;
-- 
cgit 1.4.1-3-g733a5