Auto merge of #4938 - flip1995:rustup, r=flip1995

[rust.git] / clippy_lints / src / escape.rs

diff --git a/clippy_lints/src/escape.rs b/clippy_lints/src/escape.rs
index e796b465944d9e61dee61817624a6df8bf8f1ab7..c44f2c696580c311700f3a7bd4a51c0bde8b1187 100644 (file)
--- a/clippy_lints/src/escape.rs
+++ b/clippy_lints/src/escape.rs
@@ -1,10 +1,11 @@
 use rustc::hir::intravisit as visit;
 use rustc::hir::{self, *};
+use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::layout::LayoutOf;
 use rustc::ty::{self, Ty};
 use rustc::util::nodemap::HirIdSet;
-use rustc::{declare_tool_lint, impl_lint_pass};
+use rustc_session::declare_tool_lint;
 use rustc_typeck::expr_use_visitor::*;
 use syntax::source_map::Span;
 
@@ -55,7 +56,7 @@ fn check_fn(
         cx: &LateContext<'a, 'tcx>,
         _: visit::FnKind<'tcx>,
         _: &'tcx FnDecl,
-        body: &'tcx Body,
+        body: &'tcx Body<'_>,
         _: Span,
         hir_id: HirId,
     ) {