Auto merge of #11871 - servo:rustup, r=jdm

Update Rust to 1.11.0-nightly (ad7fe6521 2016-06-23)

<!-- 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/11871)
<!-- Reviewable:end -->

components/canvas/Cargo.toml

@@ -11,13 +11,17 @@ path = "lib.rs"
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 canvas_traits = {path = "../canvas_traits"}
-plugins = {path = "../plugins"}
-util = {path = "../util"}
+euclid = "0.7.1"
 gfx_traits = {path = "../gfx_traits"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-euclid = {version = "0.6.4", features = ["plugins"]}
 gleam = "0.2.8"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 log = "0.3.5"
 num-traits = "0.1.32"
 offscreen_gl_context = "0.1.2"
+plugins = {path = "../plugins"}
+util = {path = "../util"}
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/canvas_traits/Cargo.toml

@@ -9,15 +9,18 @@ name = "canvas_traits"
 path = "lib.rs"
 
 [dependencies]
-gfx_traits = {path = "../gfx_traits"}
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-serde = {version = "0.7", features = [ "nightly" ]}
-plugins = {path = "../plugins"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
-euclid = {version = "0.6.4", features = ["plugins"]}
+euclid = "0.7.1"
+gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
-serde_macros = "0.7"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+plugins = {path = "../plugins"}
+serde = {version = "0.7.11", features = ["nightly"]}
+serde_macros = "0.7.11"
 
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/compositing/Cargo.toml

@@ -9,25 +9,33 @@ name = "compositing"
 path = "lib.rs"
 
 [dependencies]
-gfx_traits = {path = "../gfx_traits"}
-script_traits = {path = "../script_traits"}
-style_traits = {path = "../style_traits"}
-msg = {path = "../msg"}
-profile_traits = {path = "../profile_traits"}
-net_traits = {path = "../net_traits"}
-util = {path = "../util"}
-plugins = {path = "../plugins"}
+app_units = "0.2.5"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-webrender = {git = "https://github.com/servo/webrender"}
-app_units = {version = "0.2.3", features = ["plugins"]}
-euclid = {version = "0.6.4", features = ["plugins"]}
+euclid = "0.7.1"
+gfx_traits = {path = "../gfx_traits"}
 gleam = "0.2.8"
 image = "0.10"
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 log = "0.3.5"
-serde = "0.7"
-serde_macros = "0.7"
+msg = {path = "../msg"}
+net_traits = {path = "../net_traits"}
+plugins = {path = "../plugins"}
+profile_traits = {path = "../profile_traits"}
+script_traits = {path = "../script_traits"}
+serde = "0.7.11"
+serde_macros = "0.7.11"
+style_traits = {path = "../style_traits"}
 time = "0.1.17"
 url = {version = "1.0.0", features = ["heap_size"]}
+util = {path = "../util"}
+
+[dependencies.webrender]
+git = "https://github.com/servo/webrender"
+default-features = false
+features = ["serde_macros"]
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/constellation/Cargo.toml

@@ -14,7 +14,7 @@ canvas_traits = {path = "../canvas_traits"}
 clipboard = {git = "https://github.com/aweinstock314/rust-clipboard"}
 compositing = {path = "../compositing"}
 devtools_traits = {path = "../devtools_traits"}
-euclid = {version = "0.6.4", features = ["plugins"]}
+euclid = "0.7.1"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 ipc-channel = {git = "https://github.com/servo/ipc-channel"}
@@ -28,12 +28,16 @@ plugins = {path = "../plugins"}
 profile_traits = {path = "../profile_traits"}
 rand = "0.3"
 script_traits = {path = "../script_traits"}
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"
 style_traits = {path = "../style_traits"}
 url = {version = "1.0.0", features = ["heap_size"]}
 util = {path = "../util"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 gaol = {git = "https://github.com/servo/gaol"}

components/devtools/Cargo.toml

@@ -10,13 +10,13 @@ path = "lib.rs"
 
 [dependencies]
 devtools_traits = {path = "../devtools_traits"}
+hyper = { version = "0.9", features = [ "serde-serialization" ] }
+ipc-channel = {git = "https://github.com/servo/ipc-channel"}
+log = "0.3.5"
 msg = {path = "../msg"}
-util = {path = "../util"}
 plugins = {path = "../plugins"}
-ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-hyper = { version = "0.9", features = [ "serde-serialization" ] }
-serde = "0.7"
+serde = "0.7.11"
 serde_json = "0.7"
-serde_macros = "0.7"
+serde_macros = "0.7.11"
 time = "0.1"
-log = "0.3.5"
+util = {path = "../util"}

components/devtools_traits/Cargo.toml

@@ -15,7 +15,7 @@ heapsize_plugin = "0.1.2"
 hyper = {version = "0.9", features = ["serde-serialization"]}
 ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 msg = {path = "../msg"}
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"
 time = "0.1"
 url = {version = "1.0.0", features = ["heap_size"]}

components/gfx/Cargo.toml

@@ -10,10 +10,10 @@ name = "gfx"
 path = "lib.rs"
 
 [dependencies]
-app_units = {version = "0.2.3", features = ["plugins"]}
+app_units = "0.2.5"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 bitflags = "0.7"
-euclid = {version = "0.6.4", features = ["plugins", "unstable"]}
+euclid = "0.7.1"
 fnv = "1.0"
 gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
@@ -32,8 +32,8 @@ profile_traits = {path = "../profile_traits"}
 rand = "0.3"
 range = {path = "../range"}
 rustc-serialize = "0.3"
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"
 smallvec = "0.1"
 string_cache = {version = "0.2.20", features = ["heap_size"]}
 style = {path = "../style"}
@@ -42,18 +42,22 @@ time = "0.1.12"
 unicode-script = {version = "0.1", features = ["harfbuzz"]}
 url = {version = "1.0.0", features = ["heap_size"]}
 util = {path = "../util"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 xi-unicode = "0.0.1"
 
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]
+
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = "0.5"
 core-foundation = "0.2"
 core-graphics = "0.3"
 core-text = "1.1"
 
 [target.'cfg(any(target_os = "linux", target_os = "android", target_os = "windows"))'.dependencies]
-servo-fontconfig = "0.2"
 freetype = {git = "https://github.com/servo/rust-freetype"}
+servo-fontconfig = "0.2"
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
 simd = {git = "https://github.com/huonw/simd"}

components/gfx_traits/Cargo.toml

@@ -10,14 +10,14 @@ path = "lib.rs"
 
 [dependencies]
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
+euclid = "0.7.1"
+heapsize = "0.3.0"
+heapsize_plugin = "0.1.2"
 layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 msg = {path = "../msg"}
 plugins = {path = "../plugins"}
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 rustc-serialize = "0.3"
-euclid = {version = "0.6.5", features = ["plugins"]}
-heapsize = "0.3.0"
-heapsize_plugin = "0.1.2"
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"

components/layout/Cargo.toml

@@ -9,12 +9,12 @@ name = "layout"
 path = "lib.rs"
 
 [dependencies]
-app_units = {version = "0.2.3", features = ["plugins"]}
+app_units = "0.2.5"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
-euclid = {version = "0.6.4", features = ["plugins"]}
+euclid = "0.7.1"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
@@ -32,7 +32,7 @@ rustc-serialize = "0.3"
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
 selectors = {version = "0.6", features = ["heap_size"]}
-serde_macros = "0.7"
+serde_macros = "0.7.11"
 smallvec = "0.1"
 string_cache = {version = "0.2.20", features = ["heap_size"]}
 style = {path = "../style"}
@@ -42,4 +42,8 @@ unicode-bidi = "0.2"
 unicode-script = {version = "0.1", features = ["harfbuzz"]}
 url = {version = "1.0.0", features = ["heap_size"]}
 util = {path = "../util"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/layout_thread/Cargo.toml

@@ -9,9 +9,9 @@ name = "layout_thread"
 path = "lib.rs"
 
 [dependencies]
-app_units = {version = "0.2.3", features = ["plugins"]}
+app_units = "0.2.5"
 azure = {git = "https://github.com/servo/rust-azure", features = ["plugins"]}
-euclid = {version = "0.6.4", features = ["plugins"]}
+euclid = "0.7.1"
 fnv = "1.0"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
@@ -33,4 +33,8 @@ serde_macros = "0.7"
 style = {path = "../style"}
 url = {version = "1.0.0", features = ["heap_size"]}
 util = {path = "../util"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/layout_traits/Cargo.toml

@@ -16,5 +16,9 @@ net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
 util = {path = "../util"}
 ipc-channel = {git = "https://github.com/servo/ipc-channel"}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 url = {version = "1.0.0", features = ["heap_size"]}
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/msg/Cargo.toml

@@ -10,18 +10,22 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.7"
+cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]}
 cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
-euclid = {version = "0.6.4", features = ["plugins"]}
+euclid = "0.7.1"
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
 hyper = {version = "0.9", features = ["serde-serialization"]}
 ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
 plugins = {path = "../plugins"}
 rustc-serialize = "0.3.4"
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"
 url = {version = "1.0.0", features = ["heap_size", "serde"]}
 util = {path = "../util", features = ["servo"]}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
-cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] }
+
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]

components/net/Cargo.toml

@@ -38,8 +38,12 @@ unicase = "1.4.0"
 url = {version = "1.0.0", features = ["heap_size", "rustc-serialize"]}
 util = {path = "../util"}
 uuid = {version = "0.2", features = ["v4"]}
-webrender_traits = {git = "https://github.com/servo/webrender_traits"}
 websocket = "0.17"
 
+[dependencies.webrender_traits]
+git = "https://github.com/servo/webrender_traits"
+default_features = false
+features = ["serde_macros"]
+
 [target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
 tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}

components/net_traits/Cargo.toml

@@ -18,8 +18,8 @@ hyper = { version = "0.9", features = [ "serde-serialization" ] }
 image = "0.10"
 lazy_static = "0.2"
 log = "0.3.5"
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"
 url = {version = "1.0.0", features = ["heap_size"]}
 websocket = "0.17"
 uuid = { version = "0.2.2", features = ["v4", "serde"] }

components/profile/Cargo.toml

@@ -15,9 +15,9 @@ util = {path = "../util", features = ["servo"]}
 ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 heartbeats-simple = "0.3"
 log = "0.3.5"
-serde = "0.7"
+serde = "0.7.11"
 serde_json = "0.7"
-serde_macros = "0.7"
+serde_macros = "0.7.11"
 time = "0.1.12"
 
 [target.'cfg(target_os = "macos")'.dependencies]

components/profile_traits/Cargo.toml

@@ -16,6 +16,6 @@ ipc-channel = {git = "https://github.com/servo/ipc-channel"}
 energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
 energy-monitor = {version = "0.2.0", optional = true}
 plugins = {path = "../plugins"}
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"
 time = "0.1.12"

components/range/Cargo.toml

@@ -14,5 +14,5 @@ heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
 num-traits = "0.1.32"
 rustc-serialize = "0.3"
-serde = "0.7"
-serde_macros = "0.7"
+serde = "0.7.11"
+serde_macros = "0.7.11"