diff options
| author | bors <bors@rust-lang.org> | 2023-04-16 10:57:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-16 10:57:28 +0000 |
| commit | 1b50ea9abb65b33aac7285dbe36b37f9e33381a2 (patch) | |
| tree | 470812612f11875dc2c4c766273a787482ce9fe5 /compiler/rustc_infer/src | |
| parent | 18109d5032b0fd95ae81e30857a71e31e263044a (diff) | |
| parent | 7fb14ae84d927c54bcfea57f03ba38fd86326cb0 (diff) | |
| download | rust-1b50ea9abb65b33aac7285dbe36b37f9e33381a2.tar.gz rust-1b50ea9abb65b33aac7285dbe36b37f9e33381a2.zip | |
Auto merge of #110401 - fee1-dead-contrib:rollup-1f2smz2, r=fee1-dead
Rollup of 3 pull requests
Successful merges:
- #109665 (Remove `remap_env_constness` in queries)
- #110345 (Remove `TypeSuper{Foldable,Visitable}` impls for `Region`.)
- #110396 (Use lint via `lint_defs` instead of `lints`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_infer/src')
| -rw-r--r-- | compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs index 2875448ee15..ce70bcc5c85 100644 --- a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs +++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs @@ -13,7 +13,7 @@ use rustc_hir::intravisit::Visitor; use rustc_middle::hir::nested_filter; use rustc_middle::ty::error::ExpectedFound; use rustc_middle::ty::print::RegionHighlightMode; -use rustc_middle::ty::{self, Ty, TyCtxt, TypeSuperVisitable, TypeVisitor}; +use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitor}; use rustc_span::Span; use std::ops::ControlFlow; @@ -81,7 +81,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> { self.highlight.highlighting_region(r, self.counter); self.counter += 1; } - r.super_visit_with(self) + ControlFlow::Continue(()) } } |
