Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13278 - servo:rustup, r=jdm

Browse source 
Update Rust to 1.13.0-nightly (6ffdda1ba 2016-09-14)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13278)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-15 12:37:47 -05:00 • committed by GitHub
commit e0e6a7be4f
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/worker.rs
View file

@ -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 });
}
}