diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-28 09:52:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-28 09:52:38 -0500 |
commit | 73bea84b41fe573856a4e9456b209e9faa6fef48 (patch) | |
tree | 557494ef9dd07b7aeee7306028f853064177df62 | |
parent | d807cc2727130a5e2f4f8a05925f7f0bb2243537 (diff) | |
parent | 40c9601686bdfff91833f931910bb9fa2d3d317c (diff) | |
download | servo-73bea84b41fe573856a4e9456b209e9faa6fef48.tar.gz servo-73bea84b41fe573856a4e9456b209e9faa6fef48.zip |
Auto merge of #13090 - KiChjang:update-string-cache, r=Manishearth
Update string_cache to 0.2.26
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any hahahas
- [ ] `./mach test-tidy` does not report any hahahas
- [ ] These changes fix #hahaha (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR hahaha
- [ ] These changes do not require tests because hahahaha
<!-- 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/13090)
<!-- Reviewable:end -->
-rw-r--r-- | components/gfx/Cargo.toml | 2 | ||||
-rw-r--r-- | components/layout/Cargo.toml | 2 | ||||
-rw-r--r-- | components/script/Cargo.toml | 2 | ||||
-rw-r--r-- | components/script_layout_interface/Cargo.toml | 2 | ||||
-rw-r--r-- | components/servo/Cargo.lock | 20 | ||||
-rw-r--r-- | components/style/Cargo.toml | 2 | ||||
-rw-r--r-- | ports/cef/Cargo.lock | 18 | ||||
-rw-r--r-- | tests/unit/style/Cargo.toml | 2 |
8 files changed, 25 insertions, 25 deletions
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index d01aeb3ba8f..129e0d99bd1 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -38,7 +38,7 @@ rustc-serialize = "0.3" serde = "0.8" serde_macros = "0.8" smallvec = "0.1" -string_cache = {version = "0.2.25", features = ["heap_size"]} +string_cache = {version = "0.2.26", features = ["heap_size"]} style = {path = "../style"} style_traits = {path = "../style_traits"} time = "0.1.12" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 4dec4586604..0dcfd782a92 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -36,7 +36,7 @@ script_traits = {path = "../script_traits"} selectors = {version = "0.11", features = ["heap_size"]} serde_macros = "0.8" smallvec = "0.1" -string_cache = {version = "0.2.25", features = ["heap_size"]} +string_cache = {version = "0.2.26", features = ["heap_size"]} style = {path = "../style"} style_traits = {path = "../style_traits"} unicode-bidi = "0.2" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index ef7214f546b..6f4ed4e915b 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -65,7 +65,7 @@ script_traits = {path = "../script_traits"} selectors = {version = "0.11", features = ["heap_size"]} serde = "0.8" smallvec = "0.1" -string_cache = {version = "0.2.25", features = ["heap_size", "unstable"]} +string_cache = {version = "0.2.26", features = ["heap_size", "unstable"]} style = {path = "../style"} time = "0.1.12" url = {version = "1.2", features = ["heap_size", "query_encoding"]} diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 5085dc801b2..8720d7e2abe 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -28,7 +28,7 @@ profile_traits = {path = "../profile_traits"} range = {path = "../range"} script_traits = {path = "../script_traits"} selectors = {version = "0.11", features = ["heap_size"]} -string_cache = {version = "0.2.25", features = ["heap_size"]} +string_cache = {version = "0.2.26", features = ["heap_size"]} style = {path = "../style"} url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 31725d9f1c5..022c2731e1f 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -793,7 +793,7 @@ dependencies = [ "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.1 (git+https://github.com/huonw/simd)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -959,7 +959,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1167,7 +1167,7 @@ dependencies = [ "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1938,7 +1938,7 @@ dependencies = [ "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", @@ -1972,7 +1972,7 @@ dependencies = [ "range 0.0.1", "script_traits 0.0.1", "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -2031,7 +2031,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2208,7 +2208,7 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2248,7 +2248,7 @@ dependencies = [ "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2265,7 +2265,7 @@ dependencies = [ "euclid 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2714,7 +2714,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 3dcbbb1b9e1..2074c136c0e 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -44,7 +44,7 @@ selectors = "0.11" serde = {version = "0.8", optional = true} serde_macros = {version = "0.8", optional = true} smallvec = "0.1" -string_cache = {version = "0.2.25", features = ["heap_size"], optional = true} +string_cache = {version = "0.2.26", features = ["heap_size"], optional = true} style_traits = {path = "../style_traits"} time = "0.1" url = "1.2" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 0c8d8211543..814ade3dd7c 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -710,7 +710,7 @@ dependencies = [ "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simd 0.1.1 (git+https://github.com/huonw/simd)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -867,7 +867,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1075,7 +1075,7 @@ dependencies = [ "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1790,7 +1790,7 @@ dependencies = [ "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 0.1.0 (git+https://github.com/jdm/tinyfiledialogs)", @@ -1824,7 +1824,7 @@ dependencies = [ "range 0.0.1", "script_traits 0.0.1", "selectors 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1873,7 +1873,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2091,7 +2091,7 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2131,7 +2131,7 @@ dependencies = [ "serde 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2574,7 +2574,7 @@ dependencies = [ "phf 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index 138ec1472fe..38b3b5605a4 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -15,7 +15,7 @@ cssparser = {version = "0.5.7", features = ["heap_size"]} euclid = "0.10.1" rustc-serialize = "0.3" selectors = {version = "0.11", features = ["heap_size"]} -string_cache = {version = "0.2.25", features = ["heap_size"]} +string_cache = {version = "0.2.26", features = ["heap_size"]} style = {path = "../../../components/style"} style_traits = {path = "../../../components/style_traits"} url = {version = "1.2", features = ["heap_size"]} |