Auto merge of #8446 - servo:rustup_20151110, r=SimonSapin+Ms2ger+jdm+…

…Manishearth

Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08)

<s>DO NOT r+ or try+ this</s>

<s>It causes an OOM (rust-lang/rust#29740) and can crash the OS. Probably will set our CI on fire. </s>

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8446)
<!-- Reviewable:end -->

components/compositing/Cargo.toml

@@ -64,24 +64,21 @@ git = "https://github.com/servo/ipc-channel"
 git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
 features = ["texture_surface"]
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies.gaol]
 git = "https://github.com/pcwalton/gaol"
 
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
-image = "0.4.0"
-libc = "0.1"
+image = "0.5.0"
+libc = "0.2"
 log = "0.3"
 num = "0.1.24"
 time = "0.1.17"
 gleam = "0.1"
 euclid = {version = "0.3", features = ["plugins"]}
 serde = "0.6"
 serde_macros = "0.6"
+url = "0.5"
 
 [target.x86_64-apple-darwin.dependencies]
 core-graphics = "0.1"

components/devtools/Cargo.toml

@@ -7,10 +7,6 @@ authors = ["The Servo Project Developers"]
 name = "devtools"
 path = "lib.rs"
 
-[dependencies.hyper]
-version = "0.6"
-features = [ "serde-serialization" ]
-
 [dependencies.devtools_traits]
 path = "../devtools_traits"
 
@@ -26,14 +22,11 @@ path = "../plugins"
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies]
+hyper = { version = "0.7", features = [ "serde-serialization" ] }
 log = "0.3"
 time = "0.1"
 rustc-serialize = "0.3"
 serde = "0.6"
 serde_macros = "0.6"
-
+url = "0.5"

components/devtools_traits/Cargo.toml

@@ -7,30 +7,24 @@ authors = ["The Servo Project Developers"]
 name = "devtools_traits"
 path = "lib.rs"
 
-[dependencies.hyper]
-version = "0.6"
-features = [ "serde-serialization" ]
-
 [dependencies.msg]
 path = "../msg"
 
 [dependencies.util]
 path = "../util"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
 [dependencies.plugins]
 path = "../plugins"
 
 [dependencies]
+hyper = { version = "0.7", features = [ "serde-serialization" ] }
 time = "0.1"
 rustc-serialize = "0.3"
 bitflags = "0.3"
 serde = "0.6"
 serde_macros = "0.6"
+url = "0.5"
 

components/gfx/Cargo.toml

@@ -15,7 +15,7 @@ euclid = {version = "0.3", features = ["plugins"]}
 fnv = "1.0"
 harfbuzz-sys = "0.1"
 lazy_static = "0.1"
-libc = "0.1"
+libc = "0.2"
 log = "0.3"
 rand = "0.3"
 rustc-serialize = "0.3"
@@ -25,6 +25,7 @@ smallvec = "0.1"
 string_cache = "0.2"
 time = "0.1.12"
 unicode-script = { version = "0.1", features = ["harfbuzz"] }
+url = "0.5"
 
 [dependencies.plugins]
 path = "../plugins"
@@ -67,10 +68,6 @@ path = "../script_traits"
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [target.x86_64-apple-darwin.dependencies]
 core-foundation = "0.1"
 core-graphics = "0.1"

components/gfx/paint_context.rs

@@ -27,7 +27,6 @@ use euclid::size::Size2D;
 use filters;
 use font_context::FontContext;
 use gfx_traits::color;
-use libc::types::common::c99::uint32_t;
 use msg::compositor_msg::LayerKind;
 use net_traits::image::base::{Image, PixelFormat};
 use std::default::Default;
@@ -1803,7 +1802,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
                 let glyph_advance = glyph.advance();
                 let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
                 let azglyph = struct__AzGlyph {
-                    mIndex: glyph.id() as uint32_t,
+                    mIndex: glyph.id() as u32,
                     mPosition: struct__AzPoint {
                         x: (origin.x + glyph_offset.x).to_f32_px(),
                         y: (origin.y + glyph_offset.y).to_f32_px(),
@@ -1819,7 +1818,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
 
         let mut glyphbuf = struct__AzGlyphBuffer {
             mGlyphs: azglyphs.as_mut_ptr(),
-            mNumGlyphs: azglyph_buf_len as uint32_t
+            mNumGlyphs: azglyph_buf_len as u32
         };
 
         unsafe {

components/layout/Cargo.toml

@@ -59,10 +59,6 @@ git = "https://github.com/tomaka/clock_ticks"
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
 cssparser = { version = "0.4", features = [ "serde-serialization" ] }
@@ -71,7 +67,7 @@ encoding = "0.2"
 fnv = "1.0"
 bitflags = "0.3"
 rustc-serialize = "0.3"
-libc = "0.1"
+libc = "0.2"
 selectors = "0.2"
 smallvec = "0.1"
 string_cache = "0.2"
@@ -81,3 +77,4 @@ serde_macros = "0.6"
 serde_json = "0.5"
 unicode-bidi = "0.2"
 unicode-script = { version = "0.1", features = ["harfbuzz"] }
+url = "0.5"

components/layout_traits/Cargo.toml

@@ -28,12 +28,8 @@ path = "../util"
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies]
 euclid = {version = "0.3", features = ["plugins"]}
 serde = "0.6"
 serde_macros = "0.6"
-
+url = "0.5"

components/msg/Cargo.toml

@@ -24,14 +24,6 @@ features = ["plugins"]
 git = "https://github.com/servo/rust-layers"
 features = ["plugins"]
 
-[dependencies.hyper]
-version = "0.6"
-features = [ "serde-serialization" ]
-
-[dependencies.url]
-version = "0.2.36"
-features = [ "serde_serialization" ]
-
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
@@ -45,10 +37,12 @@ path = "../plugins"
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
 bitflags = "0.3"
+hyper = { version = "0.7", features = [ "serde-serialization" ] }
 rustc-serialize = "0.3.4"
 euclid = {version = "0.3", features = ["plugins"]}
 serde = "0.6"
 serde_macros = "0.6"
+url = "0.5"
 
 [target.x86_64-apple-darwin.dependencies]
 core-foundation = "0.1"

components/net/Cargo.toml

@@ -22,27 +22,21 @@ git = "https://github.com/ende76/brotli-rs"
 [dependencies.plugins]
 path = "../plugins"
 
-[dependencies.hyper]
-version = "0.6"
-features = [ "serde-serialization" ]
-
 [dependencies.msg]
 path = "../msg"
 
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies]
+hyper = { version = "0.7", features = [ "serde-serialization" ] }
 log = "0.3"
 time = "0.1.17"
-openssl="0.6.1"
+openssl = "0.7.0"
 rustc-serialize = "0.3"
-cookie = "0.1"
+cookie = "0.2"
 mime_guess = "1.1.1"
 flate2 = "0.2.0"
 uuid = "0.1.16"
 euclid = {version = "0.3", features = ["plugins"]}
+url = "0.5"

components/net/about_loader.rs

@@ -10,7 +10,6 @@ use mime_classifier::MIMEClassifier;
 use net_traits::ProgressMsg::Done;
 use net_traits::{LoadConsumer, LoadData, Metadata};
 use resource_task::{CancellationListener, send_error, start_sending_sniffed_opt};
-use std::fs::PathExt;
 use std::sync::Arc;
 use url::Url;
 use util::resource_files::resources_dir_path;

components/net/cookie.rs

@@ -115,7 +115,7 @@ impl Cookie {
     pub fn path_match(request_path: &str, cookie_path: &str) -> bool {
         request_path == cookie_path ||
         ( request_path.starts_with(cookie_path) &&
-            ( request_path.ends_with("/") || request_path.as_bytes()[cookie_path.len() - 1] == b'/' )
+            ( request_path.ends_with("/") || request_path[cookie_path.len()..].starts_with("/"))
         )
     }
 

components/net_traits/Cargo.toml

@@ -16,23 +16,17 @@ path = "../msg"
 [dependencies.stb_image]
 git = "https://github.com/servo/rust-stb-image"
 
-[dependencies.hyper]
-version = "0.6"
-features = [ "serde-serialization" ]
-
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.url]
-version = "0.2"
-features = [ "serde_serialization" ]
-
 [dependencies.plugins]
 path = "../plugins"
 
 [dependencies]
 log = "0.3"
 euclid = {version = "0.3", features = ["plugins"]}
-image = "0.4.0"
+hyper = { version = "0.7", features = [ "serde-serialization" ] }
+image = "0.5.0"
 serde = "0.6"
 serde_macros = "0.6"
+url = "0.5"

components/plugins/Cargo.toml

@@ -16,8 +16,8 @@ git = "https://github.com/Manishearth/rust-clippy"
 branch = "servo"
 optional = true
 
-[dependencies.url]
-version = "0.2.36"
+[dependencies]
+url = "0.5"
 
 [features]
 default = []

components/plugins/lib.rs

@@ -13,7 +13,7 @@
 //!  - `#[dom_struct]` : Implies `#[privatize]`,`#[derive(JSTraceable)]`, and `#[must_root]`.
 //!                       Use this for structs that correspond to a DOM type
 
-#![feature(plugin_registrar, quote, plugin, box_syntax, rustc_private)]
+#![feature(plugin_registrar, quote, plugin, box_syntax, rustc_private, slice_patterns)]
 
 #[macro_use]
 extern crate syntax;

components/plugins/lints/inheritance_integrity.rs

@@ -24,13 +24,13 @@ impl LintPass for InheritancePass {
 }
 
 impl LateLintPass for InheritancePass {
-    fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _n: ast::Name,
+    fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name,
                         _gen: &hir::Generics, id: ast::NodeId) {
         // Lints are run post expansion, so it's fine to use
         // #[_dom_struct_marker] here without also checking for #[dom_struct]
         if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "_dom_struct_marker") {
             // Find the reflector, if any
-            let reflector_span = def.fields.iter().enumerate()
+            let reflector_span = def.fields().iter().enumerate()
                                     .find(|&(ctr, f)| {
                                         if match_lang_ty(cx, &*f.node.ty, "reflector") {
                                             if ctr > 0 {
@@ -44,7 +44,7 @@ impl LateLintPass for InheritancePass {
                                     })
                                     .map(|(_, f)| f.span);
             // Find all #[dom_struct] fields
-            let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| {
+            let dom_spans: Vec<_> = def.fields().iter().enumerate().filter_map(|(ctr, f)| {
                 if let hir::TyPath(..) = f.node.ty.node {
                     if let Some(&def::PathResolution { base_def: def::DefTy(def_id, _), .. }) =
                             cx.tcx.def_map.borrow().get(&f.node.ty.id) {

components/plugins/lints/privatize.rs

@@ -25,12 +25,12 @@ impl LintPass for PrivatizePass {
 impl LateLintPass for PrivatizePass {
     fn check_struct_def(&mut self,
                         cx: &LateContext,
-                        def: &hir::StructDef,
+                        def: &hir::VariantData,
                         _n: ast::Name,
                         _gen: &hir::Generics,
                         id: ast::NodeId) {
         if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "privatize") {
-            for field in &def.fields {
+            for field in def.fields() {
                 match field.node {
                     hir::StructField_ { kind: hir::NamedField(name, visibility), .. } if visibility == hir::Public => {
                         cx.span_lint(PRIVATIZE, field.span,

components/plugins/lints/unrooted_must_root.rs

@@ -80,7 +80,7 @@ impl LateLintPass for UnrootedPass {
     /// All structs containing #[must_root] types must be #[must_root] themselves
     fn check_struct_def(&mut self,
                         cx: &LateContext,
-                        def: &hir::StructDef,
+                        def: &hir::VariantData,
                         _n: ast::Name,
                         _gen: &hir::Generics,
                         id: ast::NodeId) {
@@ -89,7 +89,7 @@ impl LateLintPass for UnrootedPass {
             _ => cx.tcx.map.expect_item(cx.tcx.map.get_parent(id)),
         };
         if item.attrs.iter().all(|a| !a.check_name("must_root")) {
-            for ref field in &def.fields {
+            for ref field in def.fields() {
                 if is_unrooted_ty(cx, cx.tcx.node_id_to_type(field.node.id), false) {
                     cx.span_lint(UNROOTED_MUST_ROOT, field.span,
                                  "Type must be rooted, use #[must_root] on the struct definition to propagate")
@@ -101,13 +101,13 @@ impl LateLintPass for UnrootedPass {
     /// All enums containing #[must_root] types must be #[must_root] themselves
     fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) {
         let ref map = cx.tcx.map;
-        if map.expect_item(map.get_parent(var.node.id)).attrs.iter().all(|a| !a.check_name("must_root")) {
-            match var.node.kind {
-                hir::TupleVariantKind(ref vec) => {
+        if map.expect_item(map.get_parent(var.node.data.id())).attrs.iter().all(|a| !a.check_name("must_root")) {
+            match var.node.data {
+                hir::VariantData::Tuple(ref vec, _) => {
                     for ty in vec {
-                        cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.id).map(|t| {
+                        cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.node.id).map(|t| {
                             if is_unrooted_ty(cx, t, false) {
-                                cx.span_lint(UNROOTED_MUST_ROOT, ty.ty.span,
+                                cx.span_lint(UNROOTED_MUST_ROOT, ty.node.ty.span,
                                              "Type must be rooted, use #[must_root] on \
                                               the enum definition to propagate")
                             }