diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-12-20 12:09:20 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-20 12:09:20 -0600 |
commit | dfd8e85338fb5460d800577d5761e979644dc869 (patch) | |
tree | 88f45838d148cd519c8fa3b2ac79e98477120afd | |
parent | e074a1c62012e966b499d797b49b2efc08fe4007 (diff) | |
parent | b3eecd04649a0c30c9b3882e4654bb7b1f728cad (diff) | |
download | servo-dfd8e85338fb5460d800577d5761e979644dc869.tar.gz servo-dfd8e85338fb5460d800577d5761e979644dc869.zip |
Auto merge of #19611 - Xanewok:bump-mozjs, r=jdm
Bump mozjs to 0.1.9
<!-- Please describe your changes on the following line: -->
Bumping rust-mozjs, which was updated in tandem ([here](https://github.com/servo/rust-mozjs/commit/f9664091b1cd6f26b58d7ba6792a16fc83376ce0)) with https://github.com/servo/servo/pull/19487, but the new version wasn't pulled in here.
r? @jdm
---
<!-- 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: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because it only bumps used crate minor version.
<!-- 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/19611)
<!-- Reviewable:end -->
-rw-r--r-- | Cargo.lock | 10 | ||||
-rw-r--r-- | components/script/Cargo.toml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index c8262aaca51..ecdaed45bc1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1692,7 +1692,7 @@ dependencies = [ "cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "hashglobe 0.1.0", - "mozjs 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "mozjs 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "servo_arc 0.0.1", "smallbitvec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1862,11 +1862,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "mozjs" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs_sys 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2586,7 +2586,7 @@ dependencies = [ "mime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mozjs 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "mozjs 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "nonzero 0.0.1", @@ -3896,7 +3896,7 @@ dependencies = [ "checksum mio 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9e965267d4d58496fc4f740e9861118367f13570cadf66316ed2c3f2f14d87c7" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f" -"checksum mozjs 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "722aeeec7049d03494ef79190343c2dea89c743c2d66acfb4555aef69dd77061" +"checksum mozjs 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c9935bada5ea5d70291f21cce7b1bbad507edea12590ebe9cfb6b665fb716480" "checksum mozjs_sys 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef1e24df9f76502cd4459919098ec1ac3af75ce694ec5b8837aa91f69f2ad0eb" "checksum mp3-metadata 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ab5f1d2693586420208d1200ce5a51cd44726f055b635176188137aff42c7de" "checksum mp4parse 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f821e3799bc0fd16d9b861fb02fa7ee1b5fba29f45ad591dade105c48ca9a1a0" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 8c3c77ed27c..704d07f39f6 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -65,7 +65,7 @@ metrics = {path = "../metrics"} mitochondria = "1.1.2" mime = "0.2.1" mime_guess = "1.8.0" -mozjs = { version = "0.1.8", features = ["promises"]} +mozjs = { version = "0.1.9", features = ["promises"]} msg = {path = "../msg"} net_traits = {path = "../net_traits"} nonzero = {path = "../nonzero"} |