diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index 4e01f6d2efb..81dece8fdd5 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -4,7 +4,6 @@ use rustc::hir::{self, ExprKind}; use rustc::hir::intravisit as visit; -use rustc::hir::map as ast_map; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext}; use rustc::ty; use syntax::{ast, source_map, symbol::Ident}; @@ -91,7 +90,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { _gen: &hir::Generics, id: ast::NodeId) { let item = match cx.tcx.hir.get(id) { - ast_map::Node::NodeItem(item) => item, + hir::Node::Item(item) => item, _ => cx.tcx.hir.expect_item(cx.tcx.hir.get_parent(id)), }; if item.attrs.iter().all(|a| !a.check_name("must_root")) { diff --git a/rust-toolchain b/rust-toolchain index 1372f1ddb7b..8cf661266f8 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2018-08-27 +nightly-2018-08-29