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

… and libc 0.2 and many other dependencies

5 files changed, 6 insertions, 11 deletions

diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index 2abf7560f1f..4a3d126cbf1 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -32,17 +32,13 @@ features = ["plugins"]
 [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" ] }
 log = "0.3"
 bitflags = "0.3"
 html5ever = { version = "0.2.1", features = ["unstable"] }
-libc = "0.1"
+libc = "0.2"
 rand = "0.3"
 rustc-serialize = "0.3"
 smallvec = "0.1"
@@ -55,5 +51,6 @@ serde_macros = "0.6"
 string_cache = "0.2"
 lazy_static = "0.1"
 getopts = "0.2.11"
-hyper = "0.6"
+hyper = "0.7"
+url = "0.5"
 uuid = "0.1.17"
diff --git a/components/util/lib.rs b/components/util/lib.rs
index 82fcf7ab62b..da6e382dc7f 100644
--- a/components/util/lib.rs
+++ b/components/util/lib.rs
@@ -12,10 +12,8 @@
 #![feature(heap_api)]
 #![feature(oom)]
 #![feature(optin_builtin_traits)]
-#![cfg_attr(not(target_os = "android"), feature(path_ext))]
 #![feature(plugin)]
 #![feature(reflect_marker)]
-#![feature(slice_splits)]
 #![feature(step_by)]
 #![feature(step_trait)]
 #![feature(zero_one)]
diff --git a/components/util/mem.rs b/components/util/mem.rs
index 968282eafda..5b976d468e4 100644
--- a/components/util/mem.rs
+++ b/components/util/mem.rs
@@ -157,7 +157,8 @@ impl HeapSizeOf for url::Host {
     fn heap_size_of_children(&self) -> usize {
         match *self {
             url::Host::Domain(ref str) => str.heap_size_of_children(),
-            url::Host::Ipv6(_) => 0
+            url::Host::Ipv6(_) => 0,
+            url::Host::Ipv4(_) => 0,
         }
     }
 }
diff --git a/components/util/resource_files.rs b/components/util/resource_files.rs
index 68d735697c7..cd7363f9c4c 100644
--- a/components/util/resource_files.rs
+++ b/components/util/resource_files.rs
@@ -26,7 +26,6 @@ pub fn resources_dir_path() -> PathBuf {
 #[cfg(not(target_os = "android"))]
 pub fn resources_dir_path() -> PathBuf {
     use std::env;
-    use std::fs::PathExt;
 
     match *CMD_RESOURCE_DIR.lock().unwrap() {
         Some(ref path) => PathBuf::from(path),
diff --git a/components/util/workqueue.rs b/components/util/workqueue.rs
index 26125335b3e..dd7c4dd355a 100644
--- a/components/util/workqueue.rs
+++ b/components/util/workqueue.rs
@@ -8,7 +8,7 @@
 //! higher-level API on top of this could allow safe fork-join parallelism.
 
 use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker};
-use libc::funcs::posix88::unistd::usleep;
+use libc::usleep;
 use rand::{Rng, XorShiftRng, weak_rng};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::{Receiver, Sender, channel};