From 12e3911d81034864314503b9c2d9fba2773c7904 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Thu, 20 Feb 2025 18:58:46 +0000
Subject: Greatly simplify lifetime captures in edition 2024

---
 compiler/rustc_lint/src/context.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'compiler/rustc_lint/src')

diff --git a/compiler/rustc_lint/src/context.rs b/compiler/rustc_lint/src/context.rs
index c74158102c7..74663e6b4bb 100644
--- a/compiler/rustc_lint/src/context.rs
+++ b/compiler/rustc_lint/src/context.rs
@@ -139,9 +139,7 @@ impl LintStore {
         &self.lints
     }
 
-    pub fn get_lint_groups<'t>(
-        &'t self,
-    ) -> impl Iterator<Item = (&'static str, Vec<LintId>, bool)> + 't {
+    pub fn get_lint_groups(&self) -> impl Iterator<Item = (&'static str, Vec<LintId>, bool)> {
         self.lint_groups
             .iter()
             .filter(|(_, LintGroup { depr, .. })| {
-- 
cgit 1.4.1-3-g733a5


From 04c453c4bc4de30b41e3bd3ee7492d37b2cc3d89 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Sat, 22 Feb 2025 23:54:08 +0000
Subject: Fix bugs due to unhandled ControlFlow

---
 compiler/rustc_lint/src/types.rs   | 2 +-
 compiler/stable_mir/src/visitor.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'compiler/rustc_lint/src')

diff --git a/compiler/rustc_lint/src/types.rs b/compiler/rustc_lint/src/types.rs
index 68b1f435a4c..3ec61cdf41a 100644
--- a/compiler/rustc_lint/src/types.rs
+++ b/compiler/rustc_lint/src/types.rs
@@ -1587,7 +1587,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
         }
 
         impl<'a, 'b, 'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for FnPtrFinder<'a, 'b, 'tcx> {
-            type Result = ControlFlow<Ty<'tcx>>;
+            type Result = ();
 
             fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {
                 if let ty::FnPtr(_, hdr) = ty.kind()
diff --git a/compiler/stable_mir/src/visitor.rs b/compiler/stable_mir/src/visitor.rs
index 3533ed2e851..8463174f9a4 100644
--- a/compiler/stable_mir/src/visitor.rs
+++ b/compiler/stable_mir/src/visitor.rs
@@ -161,7 +161,7 @@ impl Visitable for RigidTy {
             RigidTy::Slice(inner) => inner.visit(visitor),
             RigidTy::RawPtr(ty, _) => ty.visit(visitor),
             RigidTy::Ref(reg, ty, _) => {
-                reg.visit(visitor);
+                reg.visit(visitor)?;
                 ty.visit(visitor)
             }
             RigidTy::Adt(_, args)
-- 
cgit 1.4.1-3-g733a5