aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-05-19 08:15:37 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-05-19 08:15:37 -0700
commit5376bdaf48c5bfc4b17522607b1010f96d057b8e (patch)
treefc2d091be19848fcb86d895fb0513d5c1b3e136d
parent2d5dc8fa6db4d714c2018d78f502b3298a32cfaf (diff)
parent7a074215638330970babb49061db9a00c492d078 (diff)
downloadservo-5376bdaf48c5bfc4b17522607b1010f96d057b8e.tar.gz
servo-5376bdaf48c5bfc4b17522607b1010f96d057b8e.zip
Auto merge of #11263 - nox:forof, r=Ms2ger
Update js to 3352139c1dedbdff5fe1078152f46522cd04b2f3 This pulls in https://github.com/servo/rust-mozjs/pull/264. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11263) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock8
-rw-r--r--ports/cef/Cargo.lock8
-rw-r--r--ports/gonk/Cargo.lock8
-rw-r--r--tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini9
4 files changed, 12 insertions, 21 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index a2eb6d56e03..e834cb54c31 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1061,8 +1061,8 @@ dependencies = [
[[package]]
name = "js"
-version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#2bcfb73419ca893156f48b8e7966f0fc492ccfa0"
+version = "0.1.3"
+source = "git+https://github.com/servo/rust-mozjs#3352139c1dedbdff5fe1078152f46522cd04b2f3"
dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1862,7 +1862,7 @@ dependencies = [
"hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
+ "js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2361,7 +2361,7 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
+ "js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 25d66a72b1d..51712c73961 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -973,8 +973,8 @@ dependencies = [
[[package]]
name = "js"
-version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#2bcfb73419ca893156f48b8e7966f0fc492ccfa0"
+version = "0.1.3"
+source = "git+https://github.com/servo/rust-mozjs#3352139c1dedbdff5fe1078152f46522cd04b2f3"
dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1720,7 +1720,7 @@ dependencies = [
"hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
+ "js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2229,7 +2229,7 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
+ "js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 0b482116f00..007eb6439c1 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -965,8 +965,8 @@ dependencies = [
[[package]]
name = "js"
-version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#2bcfb73419ca893156f48b8e7966f0fc492ccfa0"
+version = "0.1.3"
+source = "git+https://github.com/servo/rust-mozjs#3352139c1dedbdff5fe1078152f46522cd04b2f3"
dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1712,7 +1712,7 @@ dependencies = [
"hyper 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
+ "js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2219,7 +2219,7 @@ dependencies = [
"heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "js 0.1.2 (git+https://github.com/servo/rust-mozjs)",
+ "js 0.1.3 (git+https://github.com/servo/rust-mozjs)",
"kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini b/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
index 8b8592222ff..8376e85656c 100644
--- a/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
+++ b/tests/wpt/metadata/FileAPI/blob/Blob-constructor.html.ini
@@ -3,15 +3,6 @@
[Passing non-objects, Dates and RegExps for blobParts should throw a TypeError.]
expected: FAIL
- [Getters and value conversions should happen in order until an exception is thrown.]
- expected: FAIL
-
- [Changes to the blobParts array should be reflected in the returned Blob (pop).]
- expected: FAIL
-
- [Changes to the blobParts array should be reflected in the returned Blob (unshift).]
- expected: FAIL
-
[ArrayBuffer elements of the blobParts array should be supported.]
expected: FAIL