aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-06 08:57:53 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-06 08:57:53 -0600
commitd2ba81ead2daa059a9ee889fe643d00c3d6fb8c8 (patch)
tree0e7c92040eb3a9d51c3a11e369ea04ebf771785d
parent106361443d58f57ac140e4b4033b60e98fdaad2b (diff)
parent73ce2325a2cb6529e49ef37c14f55d9db10e3dce (diff)
downloadservo-d2ba81ead2daa059a9ee889fe643d00c3d6fb8c8.tar.gz
servo-d2ba81ead2daa059a9ee889fe643d00c3d6fb8c8.zip
Auto merge of #6998 - mbrubeck:upgrade, r=Manishearth
Update to unicode-bidi 0.2.1 Also includes some missing changes from #6416. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6998) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock4
-rw-r--r--ports/cef/Cargo.lock6
-rw-r--r--ports/gonk/Cargo.lock6
-rw-r--r--tests/wpt/metadata-css/css21_dev/html4/counter-reset-increment-002.htm.ini3
-rw-r--r--tests/wpt/metadata-css/css21_dev/html4/first-letter-dynamic-002.htm.ini3
5 files changed, 10 insertions, 12 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 7d655d91ebe..36224dd676c 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -763,7 +763,7 @@ dependencies = [
"string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
- "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -1464,7 +1464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unicode-bidi"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index d292fe6f558..ce462982047 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -760,7 +760,7 @@ dependencies = [
"string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
- "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -894,6 +894,8 @@ dependencies = [
"net_traits 0.0.1",
"openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1449,7 +1451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unicode-bidi"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 04b5e92eda8..c0bad85fbb9 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -688,7 +688,7 @@ dependencies = [
"string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
- "unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -814,6 +814,8 @@ dependencies = [
"net_traits 0.0.1",
"openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
+ "regex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex_macros 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1341,7 +1343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unicode-bidi"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/wpt/metadata-css/css21_dev/html4/counter-reset-increment-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/counter-reset-increment-002.htm.ini
deleted file mode 100644
index a37718f2098..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/counter-reset-increment-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[counter-reset-increment-002.htm]
- type: reftest
- expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/first-letter-dynamic-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/first-letter-dynamic-002.htm.ini
deleted file mode 100644
index 08bfcf210da..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/first-letter-dynamic-002.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[first-letter-dynamic-002.htm]
- type: reftest
- expected: FAIL