Auto merge of #65672 - ecstatic-morse:unified-dataflow-proto, r=pnkfelix

[rust.git] / src / librustc_passes / loops.rs

diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index 262f2382da3a4decea39524db13d6d0d782a96dc..69d6b38005c4c7ea02f0571e9f0d61a52e83ef4c 100644 (file)
--- a/src/librustc_passes/loops.rs
+++ b/src/librustc_passes/loops.rs
@@ -1,19 +1,16 @@
 use Context::*;
 
-use rustc::session::Session;
-
-use errors::{struct_span_err, Applicability};
-use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc::hir::map::Map;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_errors::{struct_span_err, Applicability};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
+use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::{Destination, Movability, Node};
+use rustc_session::Session;
 use rustc_span::Span;
 
-use rustc_error_codes::*;
-
 #[derive(Clone, Copy, Debug, PartialEq)]
 enum Context {
     Normal,
@@ -44,7 +41,9 @@ pub(crate) fn provide(providers: &mut Providers<'_>) {
 }
 
 impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
-    fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'hir> {
+    type Map = Map<'hir>;
+
+    fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> {
         NestedVisitorMap::OnlyBodies(&self.hir_map)
     }