From c234bf92d0f45ebfbfceff92be7101728831379d Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 26 Apr 2017 17:34:34 +0200 Subject: [PATCH] Update rustc to 1.18.0-nightly (b0a4074c5 2017-04-26) --- components/script_plugins/unrooted_must_root.rs | 6 +++--- rust-commit-hash | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index d869211315e..844eb9b87e6 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -95,7 +95,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { if item.attrs.iter().all(|a| !a.check_name("must_root")) { for ref field in def.fields() { let def_id = cx.tcx.hir.local_def_id(field.id); - if is_unrooted_ty(cx, cx.tcx.item_type(def_id), false) { + if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { cx.span_lint(UNROOTED_MUST_ROOT, field.span, "Type must be rooted, use #[must_root] on the struct definition to propagate") } @@ -111,7 +111,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { hir::VariantData::Tuple(ref fields, _) => { for ref field in fields { let def_id = cx.tcx.hir.local_def_id(field.id); - if is_unrooted_ty(cx, cx.tcx.item_type(def_id), false) { + if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { cx.span_lint(UNROOTED_MUST_ROOT, field.ty.span, "Type must be rooted, use #[must_root] on \ the enum definition to propagate") @@ -140,7 +140,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { if !in_derive_expn(span) { let def_id = cx.tcx.hir.local_def_id(id); - let ty = cx.tcx.item_type(def_id); + let ty = cx.tcx.type_of(def_id); for (arg, ty) in decl.inputs.iter().zip(ty.fn_args().0.iter()) { if is_unrooted_ty(cx, ty, false) { diff --git a/rust-commit-hash b/rust-commit-hash index 04ac98844fd..35b3001bbeb 100644 --- a/rust-commit-hash +++ b/rust-commit-hash @@ -1 +1 @@ -23de823e93dc19ef1b9cb65b48860a892cd6ff18 \ No newline at end of file +b0a4074c5e87d24ff630f6aa456a64698bff3ed2 \ No newline at end of file