diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-15 07:32:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-15 07:32:11 -0500 |
commit | 9bc565362b8787768db77ac458c9fb8005e14023 (patch) | |
tree | b05ec40fce5e3a3e2ada25ad34766aa661e13859 | |
parent | 5cd8265f9a279e1cebe84218e691e7f80a541fb9 (diff) | |
parent | 49160489240bfa6177883dd42f81cee9f9ac35b1 (diff) | |
download | servo-9bc565362b8787768db77ac458c9fb8005e14023.tar.gz servo-9bc565362b8787768db77ac458c9fb8005e14023.zip |
Auto merge of #16866 - MortimerGoro:update_mozjs, r=nox
Update mozjs_sys
<!-- Please describe your changes on the following line: -->
See https://github.com/servo/mozjs/pull/118
Required for https://github.com/servo/servo/issues/11921
---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- 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/16866)
<!-- Reviewable:end -->
-rw-r--r-- | Cargo.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 24353999f28..7c61c2c0228 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1675,7 +1675,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#29132f6790dd0c066f10fc398a7071f6a5b6bc65" +source = "git+https://github.com/servo/mozjs#834ce35c3f008010213351107b68f397989d2ffd" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", |