diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index 0e6f9e16e65..83f7a8857ab 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -153,10 +153,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { ) { let item = match cx.tcx.hir().get_by_hir_id(id) { hir::Node::Item(item) => item, - _ => cx - .tcx - .hir() - .expect_item_by_hir_id(cx.tcx.hir().get_parent_item(id)), + _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id)), }; if item .attrs @@ -177,7 +174,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) { let ref map = cx.tcx.hir(); if map - .expect_item_by_hir_id(map.get_parent_item(var.node.id)) + .expect_item(map.get_parent_item(var.node.id)) .attrs .iter() .all(|a| !a.check_name(self.symbols.must_root)) diff --git a/components/script_plugins/webidl_must_inherit.rs b/components/script_plugins/webidl_must_inherit.rs index 7d51b7f10f7..556136261ab 100644 --- a/components/script_plugins/webidl_must_inherit.rs +++ b/components/script_plugins/webidl_must_inherit.rs @@ -192,10 +192,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass { let item = match cx.tcx.hir().get_by_hir_id(id) { hir::Node::Item(item) => item, - _ => cx - .tcx - .hir() - .expect_item_by_hir_id(cx.tcx.hir().get_parent_item(id)), + _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id)), }; let parent_name = def.fields().iter().next().map(|field| { diff --git a/rust-toolchain b/rust-toolchain index 38f670ca625..21586c21176 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2019-05-14 +nightly-2019-06-19