From ec12355cb32efe751f3a3354d5a0d62884955acd Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 15 Sep 2016 17:00:56 +0200 Subject: [PATCH] Update Rust to 1.13.0-nightly (6ffdda1ba 2016-09-14) --- components/plugins/lints/unrooted_must_root.rs | 3 +-- components/script/dom/worker.rs | 5 +++-- components/script_traits/lib.rs | 1 - rust-nightly-date | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs index f08d5b7572f..5dc94df69f7 100644 --- a/components/plugins/lints/unrooted_must_root.rs +++ b/components/plugins/lints/unrooted_must_root.rs @@ -43,8 +43,7 @@ fn is_unrooted_ty(cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool let mut ret = false; ty.maybe_walk(|t| { match t.sty { - ty::TyStruct(did, _) | - ty::TyEnum(did, _) => { + ty::TyAdt(did, _) => { if cx.tcx.has_attr(did.did, "must_root") { ret = true; false diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 9438569a5d1..1df110a12e5 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -140,6 +140,7 @@ impl Worker { worker.upcast().fire_simple_event("error"); } + #[allow(unsafe_code)] fn dispatch_error(&self, error_info: ErrorInfo) { let global = self.global(); let event = ErrorEvent::new(global.r(), @@ -150,14 +151,14 @@ impl Worker { error_info.filename.as_str().into(), error_info.lineno, error_info.column, - NullHandleValue); + unsafe { NullHandleValue }); let handled = !event.upcast::().fire(self.upcast::()); if handled { return; } - global.r().report_an_error(error_info, NullHandleValue); + global.r().report_an_error(error_info, unsafe { NullHandleValue }); } } diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 104483d2b3f..6250dcf5ce4 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -6,7 +6,6 @@ //! The traits are here instead of in script so that these modules won't have //! to depend on script. -#![feature(core_intrinsics)] #![feature(custom_derive, plugin)] #![plugin(heapsize_plugin, plugins, serde_macros)] #![deny(missing_docs)] diff --git a/rust-nightly-date b/rust-nightly-date index f96de36a9fd..b9b22d99d6d 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2016-09-05 +2016-09-15