From 491f72442e891973cf447813794ab472383c810b Mon Sep 17 00:00:00 2001 From: =?utf8?q?F=C3=A9lix=20Fischer?= Date: Fri, 29 Mar 2019 01:47:09 -0300 Subject: [PATCH] Updated source to match with recent rustc `master` toolchain changes --- clippy_lints/src/enum_glob_use.rs | 3 ++- clippy_lints/src/lifetimes.rs | 3 ++- src/driver.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/clippy_lints/src/enum_glob_use.rs b/clippy_lints/src/enum_glob_use.rs index 37575f10f19..afdf27376d8 100644 --- a/clippy_lints/src/enum_glob_use.rs +++ b/clippy_lints/src/enum_glob_use.rs @@ -39,9 +39,10 @@ fn name(&self) -> &'static str { impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EnumGlobUse { fn check_mod(&mut self, cx: &LateContext<'a, 'tcx>, m: &'tcx Mod, _: Span, _: HirId) { + let map = cx.tcx.hir(); // only check top level `use` statements for item in &m.item_ids { - self.lint_item(cx, cx.tcx.hir().expect_item(item.id)); + self.lint_item(cx, map.expect_item(map.hir_to_node_id(item.id))); } } } diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs index 4b2ba60090f..cd717e586e7 100644 --- a/clippy_lints/src/lifetimes.rs +++ b/clippy_lints/src/lifetimes.rs @@ -356,7 +356,8 @@ fn visit_ty(&mut self, ty: &'tcx Ty) { self.collect_anonymous_lifetimes(path, ty); }, TyKind::Def(item, _) => { - if let ItemKind::Existential(ref exist_ty) = self.cx.tcx.hir().expect_item(item.id).node { + let map = self.cx.tcx.hir(); + if let ItemKind::Existential(ref exist_ty) = map.expect_item(map.hir_to_node_id(item.id)).node { for bound in &exist_ty.bounds { if let GenericBound::Outlives(_) = *bound { self.record(&None); diff --git a/src/driver.rs b/src/driver.rs index 01358f46dd7..0b5c259ec4e 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -93,7 +93,7 @@ fn after_parsing(&mut self, compiler: &interface::Compiler) -> bool { ls.register_early_pass(Some(sess), true, false, pass); } for pass in late_lint_passes { - ls.register_late_pass(Some(sess), true, pass); + ls.register_late_pass(Some(sess), true, false, pass); } for (name, (to, deprecated_name)) in lint_groups { -- 2.44.0