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 | |
| 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')
| -rw-r--r-- | components/script/dom/bindings/error.rs | 4 | ||||
| -rw-r--r-- | components/script/lib.rs | 1 | ||||
| -rw-r--r-- | components/script/script_runtime.rs | 8 |
3 files changed, 6 insertions, 7 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 => { diff --git a/components/script/lib.rs b/components/script/lib.rs index 5b16377fe68..20eb3336a38 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -10,7 +10,6 @@ #![feature(custom_attribute)] #![feature(custom_derive)] #![feature(fnbox)] -#![feature(iter_arith)] #![feature(mpsc_select)] #![feature(nonzero)] #![feature(on_unimplemented)] diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index d07491d8ce8..dfbb5ba5203 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -120,7 +120,7 @@ pub unsafe fn new_rt_and_cx() -> Runtime { // Pre barriers aren't working correctly at the moment DisableIncrementalGC(runtime.rt()); - set_gc_zeal_options(runtime.cx()); + set_gc_zeal_options(runtime.rt()); // Enable or disable the JITs. let rt_opts = &mut *RuntimeOptionsRef(runtime.rt()); @@ -400,7 +400,7 @@ unsafe extern fn trace_rust_roots(tr: *mut JSTracer, _data: *mut os::raw::c_void #[allow(unsafe_code)] #[cfg(feature = "debugmozjs")] -unsafe fn set_gc_zeal_options(cx: *mut JSContext) { +unsafe fn set_gc_zeal_options(rt: *mut JSRuntime) { use js::jsapi::{JS_DEFAULT_ZEAL_FREQ, JS_SetGCZeal}; let level = match PREFS.get("js.mem.gc.zeal.level").as_i64() { @@ -411,9 +411,9 @@ unsafe fn set_gc_zeal_options(cx: *mut JSContext) { Some(frequency) if frequency >= 0 => frequency as u32, _ => JS_DEFAULT_ZEAL_FREQ, }; - JS_SetGCZeal(cx, level, frequency); + JS_SetGCZeal(rt, level, frequency); } #[allow(unsafe_code)] #[cfg(not(feature = "debugmozjs"))] -unsafe fn set_gc_zeal_options(_: *mut JSContext) {} +unsafe fn set_gc_zeal_options(_: *mut JSRuntime) {} |