rust-lang-ci · Mar 5, 2024
diff --git a/‎compiler/rustc_hir_analysis/src/check/check.rs
+2-3 b/‎compiler/rustc_hir_analysis/src/check/check.rs
+2-3
diff --git a/‎compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs
+3-7 b/‎compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs
+3-7
diff --git a/‎compiler/rustc_hir_analysis/src/check/region.rs
+1-1 b/‎compiler/rustc_hir_analysis/src/check/region.rs
+1-1
@@ -1474,15 +1474,14 @@ fn opaque_type_cycle_error(
                     closures: Vec<DefId>,
                 }
                 impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector {
-                    fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {
+                    fn visit_ty(&mut self, t: Ty<'tcx>) {
                         match *t.kind() {
                             ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, .. }) => {
                                 self.opaques.push(def);
-                                ControlFlow::Continue(())
                             }
                             ty::Closure(def_id, ..) | ty::Coroutine(def_id, ..) => {
                                 self.closures.push(def_id);
-                                t.super_visit_with(self)
+                                t.super_visit_with(self);
                             }
                             _ => t.super_visit_with(self),
                         }
 
@@ -12,7 +12,6 @@ use rustc_trait_selection::regions::InferCtxtRegionExt;
 use rustc_trait_selection::traits::{
     elaborate, normalize_param_env_or_error, outlives_bounds::InferCtxtExt, ObligationCtxt,
 };
-use std::ops::ControlFlow;
 
 /// Check that an implementation does not refine an RPITIT from a trait method signature.
 pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
@@ -211,9 +210,7 @@ struct ImplTraitInTraitCollector<'tcx> {
 }
 
 impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'tcx> {
-    type BreakTy = !;
-
-    fn visit_ty(&mut self, ty: Ty<'tcx>) -> std::ops::ControlFlow<Self::BreakTy> {
+    fn visit_ty(&mut self, ty: Ty<'tcx>) {
         if let ty::Alias(ty::Projection, proj) = *ty.kind()
             && self.tcx.is_impl_trait_in_trait(proj.def_id)
         {
@@ -223,12 +220,11 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'tcx> {
                     .explicit_item_bounds(proj.def_id)
                     .iter_instantiated_copied(self.tcx, proj.args)
                 {
-                    pred.visit_with(self)?;
+                    pred.visit_with(self);
                 }
             }
-            ControlFlow::Continue(())
         } else {
-            ty.super_visit_with(self)
+            ty.super_visit_with(self);
         }
     }
 }
 
@@ -6,7 +6,7 @@
 //!
 //! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/borrow_check.html
 
-use rustc_ast::walk_list;
+use rustc_ast::visit::walk_list;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
Original file line number	Diff line number	Diff line change
`@@ -1474,15 +1474,14 @@ fn opaque_type_cycle_error(`
`1474`	`1474`	`closures: Vec<DefId>,`
`1475`	`1475`	`}`
`1476`	`1476`	`impl<'tcx> ty::visit::TypeVisitor<TyCtxt<'tcx>> for OpaqueTypeCollector {`
`1477`		`- fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {`
	`1477`	`+ fn visit_ty(&mut self, t: Ty<'tcx>) {`
`1478`	`1478`	`match *t.kind() {`
`1479`	`1479`	`ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, .. }) => {`
`1480`	`1480`	`self.opaques.push(def);`
`1481`		`- ControlFlow::Continue(())`
`1482`	`1481`	`}`
`1483`	`1482`	`ty::Closure(def_id, ..) \| ty::Coroutine(def_id, ..) => {`
`1484`	`1483`	`self.closures.push(def_id);`
`1485`		`- t.super_visit_with(self)`
	`1484`	`+ t.super_visit_with(self);`
`1486`	`1485`	`}`
`1487`	`1486`	`_ => t.super_visit_with(self),`
`1488`	`1487`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ use rustc_trait_selection::regions::InferCtxtRegionExt;`
`12`	`12`	`use rustc_trait_selection::traits::{`
`13`	`13`	`elaborate, normalize_param_env_or_error, outlives_bounds::InferCtxtExt, ObligationCtxt,`
`14`	`14`	`};`
`15`		`-use std::ops::ControlFlow;`
`16`	`15`
`17`	`16`	`/// Check that an implementation does not refine an RPITIT from a trait method signature.`
`18`	`17`	`pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(`
`@@ -211,9 +210,7 @@ struct ImplTraitInTraitCollector<'tcx> {`
`211`	`210`	`}`
`212`	`211`
`213`	`212`	`impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'tcx> {`
`214`		`- type BreakTy = !;`
`215`		`-`
`216`		`- fn visit_ty(&mut self, ty: Ty<'tcx>) -> std::ops::ControlFlow<Self::BreakTy> {`
	`213`	`+ fn visit_ty(&mut self, ty: Ty<'tcx>) {`
`217`	`214`	`if let ty::Alias(ty::Projection, proj) = *ty.kind()`
`218`	`215`	`&& self.tcx.is_impl_trait_in_trait(proj.def_id)`
`219`	`216`	`{`
`@@ -223,12 +220,11 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for ImplTraitInTraitCollector<'tcx> {`
`223`	`220`	`.explicit_item_bounds(proj.def_id)`
`224`	`221`	`.iter_instantiated_copied(self.tcx, proj.args)`
`225`	`222`	`{`
`226`		`- pred.visit_with(self)?;`
	`223`	`+ pred.visit_with(self);`
`227`	`224`	`}`
`228`	`225`	`}`
`229`		`- ControlFlow::Continue(())`
`230`	`226`	`} else {`
`231`		`- ty.super_visit_with(self)`
	`227`	`+ ty.super_visit_with(self);`
`232`	`228`	`}`
`233`	`229`	`}`
`234`	`230`	`}`