X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_typeck%2Fcheck_unused.rs;h=7af1a342ff36edd98b532739407c13aa4910aae7;hb=6c1b220fd747bf244f04b380e4d4ae005068f706;hp=8614de1977085f3f3a2993a10a450e76115f1901;hpb=18081890ea7c4f3cb38d51be5ddea4f51dc262c3;p=rust.git diff --git a/src/librustc_typeck/check_unused.rs b/src/librustc_typeck/check_unused.rs index 8614de19770..7af1a342ff3 100644 --- a/src/librustc_typeck/check_unused.rs +++ b/src/librustc_typeck/check_unused.rs @@ -33,7 +33,7 @@ fn visit_item(&mut self, item: &hir::Item) { if item.vis.node.is_pub() || item.span.is_dummy() { return; } - if let hir::ItemKind::Use(ref path, _) = item.node { + if let hir::ItemKind::Use(ref path, _) = item.kind { self.check_import(item.hir_id, path.span); } } @@ -52,7 +52,7 @@ struct CheckVisitor<'tcx> { impl CheckVisitor<'tcx> { fn check_import(&self, id: hir::HirId, span: Span) { - let def_id = self.tcx.hir().local_def_id_from_hir_id(id); + let def_id = self.tcx.hir().local_def_id(id); if !self.tcx.maybe_unused_trait_import(def_id) { return; } @@ -218,8 +218,8 @@ struct ExternCrateToLint { impl<'a, 'tcx, 'v> ItemLikeVisitor<'v> for CollectExternCrateVisitor<'a, 'tcx> { fn visit_item(&mut self, item: &hir::Item) { - if let hir::ItemKind::ExternCrate(orig_name) = item.node { - let extern_crate_def_id = self.tcx.hir().local_def_id_from_hir_id(item.hir_id); + if let hir::ItemKind::ExternCrate(orig_name) = item.kind { + let extern_crate_def_id = self.tcx.hir().local_def_id(item.hir_id); self.crates_to_lint.push( ExternCrateToLint { def_id: extern_crate_def_id,