Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12)

… and libc 0.2 and many other dependencies

3 files changed, 5 insertions, 12 deletions

diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index d1ee383a23a..9e550a14b40 100644
--- a/components/net/Cargo.toml
+++ b/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"
diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs
index cd55dd0b42b..c81ecc49b87 100644
--- a/components/net/about_loader.rs
+++ b/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;
diff --git a/components/net/cookie.rs b/components/net/cookie.rs
index 67e95661c77..c0f6b1645f6 100644
--- a/components/net/cookie.rs
+++ b/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("/"))
         )
     }