diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-29 04:42:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 04:42:18 -0500 |
| commit | 74d3b87c3e79abaf5c64e6e3f06e8a00148ea19d (patch) | |
| tree | d42ad887c873c482dba774c5ebebf167c0dd2169 /components/script/dom/bindings/error.rs | |
| parent | 7e39efa2dfb37a87745c1548e313527806891777 (diff) | |
| parent | 7842b72c096f0971f7319b3e9c3359330ac05521 (diff) | |
| download | servo-74d3b87c3e79abaf5c64e6e3f06e8a00148ea19d.tar.gz servo-74d3b87c3e79abaf5c64e6e3f06e8a00148ea19d.zip | |
Auto merge of #12649 - Ms2ger:update-script, r=Manishearth
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 -->
Diffstat (limited to 'components/script/dom/bindings/error.rs')
| -rw-r--r-- | components/script/dom/bindings/error.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs index bd63ba84fb1..c4bda97e521 100644 --- a/components/script/dom/bindings/error.rs +++ b/components/script/dom/bindings/error.rs @@ -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 => { |