diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-20 02:52:40 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-20 02:52:40 -0600 |
| commit | 14b921ee29b1b5e46e8773836b5a31e85faabfd5 (patch) | |
| tree | dfd99ada33662d48865d893849f1d8b8faa1c52d | |
| parent | c328b76459f34dfe33570d686452e08b7718b4bd (diff) | |
| parent | 911794715dbc055ad0469c47be470eaf832ae64c (diff) | |
| download | servo-14b921ee29b1b5e46e8773836b5a31e85faabfd5.tar.gz servo-14b921ee29b1b5e46e8773836b5a31e85faabfd5.zip | |
Auto merge of #7285 - frewsxcv:bump-mozjs, r=Ms2ger
Bump js (rust-mozjs) to the latest commit
I need the constants added in
https://github.com/servo/rust-mozjs/pull/191 for
https://github.com/servo/servo/pull/7254
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7285)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 02a96a64acd..60df35ece0d 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -728,7 +728,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9" +source = "git+https://github.com/servo/rust-mozjs#ff77d7152515b8dbfe29cb5f883e3a348673741c" dependencies = [ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 04470eea902..5a5a50c886b 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -720,7 +720,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9" +source = "git+https://github.com/servo/rust-mozjs#ff77d7152515b8dbfe29cb5f883e3a348673741c" dependencies = [ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 9e5f5c4d1d8..d724a18ab4b 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#85e4eff9936889436b24ceefd689d4467db302a9" +source = "git+https://github.com/servo/rust-mozjs#ff77d7152515b8dbfe29cb5f883e3a348673741c" dependencies = [ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", |