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

Auto merge of #12649 - Ms2ger:update-script, r=Manishearth

Browse source 
Some fixes to the script crate.

<!-- 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/12649)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-29 04:42:18 -05:00 • committed by GitHub
commit 74d3b87c3e
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/error.rs
View file

@ -178,7 +178,7 @@ impl ErrorInfo {
})
}
fn from_dom_exception(cx: *mut JSContext, object: HandleObject) -> Option<ErrorInfo> {
fn from_dom_exception(object: HandleObject) -> Option<ErrorInfo> {
let exception = match root_from_object::<DOMException>(object.get()) {
Ok(exception) => exception,
Err(_) => return None,
@ -215,7 +215,7 @@ pub unsafe fn report_pending_exception(cx: *mut JSContext, obj: *mut JSObject) {
rooted!(in(cx) let object = value.to_object());
let error_info = ErrorInfo::from_native_error(cx, object.handle())
.or_else(|| ErrorInfo::from_dom_exception(cx, object.handle()));
.or_else(|| ErrorInfo::from_dom_exception(object.handle()));
let error_info = match error_info {
Some(error_info) => error_info,
None => {