mirror of
https://github.com/servo/servo.git
synced 2025-06-20 15:18:58 +01:00
Update Rust to 1.13.0-nightly (6ffdda1ba 2016-09-14)
This commit is contained in:
parent
b3db4b4c0d
commit
ec12355cb3
4 changed files with 5 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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::<Event>().fire(self.upcast::<EventTarget>());
|
||||
if handled {
|
||||
return;
|
||||
}
|
||||
|
||||
global.r().report_an_error(error_info, NullHandleValue);
|
||||
global.r().report_an_error(error_info, unsafe { NullHandleValue });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)]
|
||||
|
|
|
@ -1 +1 @@
|
|||
2016-09-05
|
||||
2016-09-15
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue