From 3509bcb5319fca02dc9c40ab5feeee9014534263 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 17 Jul 2018 20:23:32 +0200 Subject: [PATCH] Upgrade to rustc 1.29.0-nightly (1ecf6929d 2018-07-16) --- components/dom_struct/lib.rs | 3 --- components/script/lib.rs | 2 +- components/script_plugins/unrooted_must_root.rs | 4 ++-- rust-toolchain | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/components/dom_struct/lib.rs b/components/dom_struct/lib.rs index a9d9204c534..0fa5f4f8163 100644 --- a/components/dom_struct/lib.rs +++ b/components/dom_struct/lib.rs @@ -2,9 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#![feature(proc_macro)] -#![feature(proc_macro_non_items)] - extern crate proc_macro; #[macro_use] diff --git a/components/script/lib.rs b/components/script/lib.rs index 837b744424c..d151734da80 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -7,8 +7,8 @@ #![feature(const_fn)] #![feature(mpsc_select)] #![feature(plugin)] -#![feature(proc_macro)] #![feature(string_retain)] +#![feature(use_extern_macros)] #![deny(unsafe_code)] #![allow(non_snake_case)] diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index 29e74940536..86825808f2c 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use rustc::hir; +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}; @@ -185,7 +185,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { match expr.node { // Trait casts from #[must_root] types are not allowed - hir::ExprCast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr), + ExprKind::Cast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr), // This catches assignments... the main point of this would be to catch mutable // references to `JS`. // FIXME: Enable this? Triggers on certain kinds of uses of DomRefCell. diff --git a/rust-toolchain b/rust-toolchain index 7888624d5e7..c4773552808 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2018-07-07 +nightly-2018-07-17