diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 08:11:19 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 08:11:19 +0530 |
commit | 8c0f0a22d2a574027c35272dba76ab9713e39652 (patch) | |
tree | 538721a87b5a46abf69a62eae43ebf03556a5c39 | |
parent | d16ba51b4722a84f69976ca8679af672495248c8 (diff) | |
parent | 2a509e4fa22c3d27d03dcf765ed0a67c70daa529 (diff) | |
download | servo-8c0f0a22d2a574027c35272dba76ab9713e39652.tar.gz servo-8c0f0a22d2a574027c35272dba76ab9713e39652.zip |
Auto merge of #8370 - Ms2ger:update-js, r=jdm
Update js.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8370)
<!-- Reviewable:end -->
-rw-r--r-- | components/servo/Cargo.lock | 8 | ||||
-rw-r--r-- | ports/cef/Cargo.lock | 11 | ||||
-rw-r--r-- | ports/gonk/Cargo.lock | 9 | ||||
-rw-r--r-- | tests/wpt/metadata/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm.ini | 4 | ||||
-rw-r--r-- | tests/wpt/metadata/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm.ini | 4 |
5 files changed, 19 insertions, 17 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 9cf20c4fe1b..89c9b02d0af 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -935,8 +935,8 @@ dependencies = [ [[package]] name = "js" -version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#8fabaf877224fdd7a33286c5de2a99189aae5524" +version = "0.1.1" +source = "git+https://github.com/servo/rust-mozjs#e2458c40432119693456c73ac0710ff182cfc6d2" dependencies = [ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1511,7 +1511,7 @@ dependencies = [ "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1901,7 +1901,7 @@ dependencies = [ "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index ad3367f50d7..dd55f18437c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ "gfx 0.0.1", "gleam 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "glutin_app 0.0.1", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -888,8 +888,8 @@ dependencies = [ [[package]] name = "js" -version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#8fabaf877224fdd7a33286c5de2a99189aae5524" +version = "0.1.1" +source = "git+https://github.com/servo/rust-mozjs#e2458c40432119693456c73ac0710ff182cfc6d2" dependencies = [ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1133,6 +1133,7 @@ dependencies = [ "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "msg 0.0.1", "net_traits 0.0.1", "openssl 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", @@ -1444,7 +1445,7 @@ dependencies = [ "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1843,7 +1844,7 @@ dependencies = [ "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 87437ef7d79..52c85a1bd18 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -868,8 +868,8 @@ dependencies = [ [[package]] name = "js" -version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#8fabaf877224fdd7a33286c5de2a99189aae5524" +version = "0.1.1" +source = "git+https://github.com/servo/rust-mozjs#e2458c40432119693456c73ac0710ff182cfc6d2" dependencies = [ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1113,6 +1113,7 @@ dependencies = [ "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "msg 0.0.1", "net_traits 0.0.1", "openssl 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", @@ -1424,7 +1425,7 @@ dependencies = [ "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1821,7 +1822,7 @@ dependencies = [ "html5ever 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", - "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", + "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/tests/wpt/metadata/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm.ini b/tests/wpt/metadata/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm.ini index 68d82dd90ec..8138e2ed72a 100644 --- a/tests/wpt/metadata/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm.ini @@ -1,6 +1,6 @@ [overridemimetype-open-state-force-utf-8.htm] type: testharness - expected: CRASH + expected: TIMEOUT [XMLHttpRequest: overrideMimeType() in open state, enforcing UTF-8 encoding] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm.ini b/tests/wpt/metadata/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm.ini index be43cd7a16e..625100da359 100644 --- a/tests/wpt/metadata/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm.ini @@ -1,6 +1,6 @@ [overridemimetype-unsent-state-force-shiftjis.htm] type: testharness - expected: CRASH + expected: TIMEOUT [XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding] - expected: FAIL + expected: TIMEOUT |