aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-26 17:18:41 -0500
committerGitHub <noreply@github.com>2016-07-26 17:18:41 -0500
commit0be8e6857f4f767129dd694bf1e7e86060d307a4 (patch)
tree6fd6a4788628df18dde8860edbd2fdec811c7622 /components/script
parentf71b584458fcdd76465396854e204bb1e98d6553 (diff)
parent3d8eab424ccfbb7c6403f74577d5c8c7d83091f3 (diff)
downloadservo-0be8e6857f4f767129dd694bf1e7e86060d307a4.tar.gz
servo-0be8e6857f4f767129dd694bf1e7e86060d307a4.zip
Auto merge of #12586 - servo:rustup, r=nox
Update Rust to 1.12.0-nightly (9316ae515 2016-07-24) <!-- 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/12586) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/Cargo.toml6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 89525b535ee..72c436fce81 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -46,8 +46,8 @@ net_traits = {path = "../net_traits"}
num-traits = "0.1.32"
offscreen_gl_context = "0.1.2"
open = "1.1.1"
-phf = "0.7.13"
-phf_macros = "0.7.13"
+phf = "0.7.16"
+phf_macros = "0.7.16"
plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
rand = "0.3"
@@ -59,7 +59,7 @@ rustc-serialize = "0.3"
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
selectors = {version = "0.7", features = ["heap_size"]}
-serde = "0.7.11"
+serde = "0.7.15"
smallvec = "0.1"
string_cache = {version = "0.2.20", features = ["heap_size", "unstable"]}
style = {path = "../style"}