diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-08 16:04:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-08 16:04:26 -0400 |
commit | c3a79e871130abfd19905cd595dd4ccedab63316 (patch) | |
tree | 574f8fe0bd51c3a8e53334530ddc87941b5e295c /components/script/script_runtime.rs | |
parent | ea71b3522061c48256ab1c5a27fb2db8f2607e0e (diff) | |
parent | a54080749315ba8772db01c3f8b6263349d4aec4 (diff) | |
download | servo-c3a79e871130abfd19905cd595dd4ccedab63316.tar.gz servo-c3a79e871130abfd19905cd595dd4ccedab63316.zip |
Auto merge of #23318 - asajeffrey:magicleap-debugmozjs, r=jdm
Fix magicleap debugmozjs
<!-- Please describe your changes on the following line: -->
These changes get magicleap servo to compile with `--debugmozjs`.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #23074 and fix #22069
- [X] These changes do not require tests because we're not building debugmozjs servo for magicleap
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/23318)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_runtime.rs')
-rw-r--r-- | components/script/script_runtime.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index 6cad5d4238e..80fe9cf31e5 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -685,11 +685,11 @@ unsafe fn set_gc_zeal_options(cx: *mut JSContext) { use js::jsapi::{JS_SetGCZeal, JS_DEFAULT_ZEAL_FREQ}; let level = match pref!(js.mem.gc.zeal.level) { - Some(level @ 0...14) => level as u8, + level @ 0...14 => level as u8, _ => return, }; let frequency = match pref!(js.mem.gc.zeal.frequency) { - Some(frequency) if frequency >= 0 => frequency as u32, + frequency if frequency >= 0 => frequency as u32, _ => JS_DEFAULT_ZEAL_FREQ, }; JS_SetGCZeal(cx, level, frequency); |