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

… and libc 0.2 and many other dependencies
This commit is contained in:
Manish Goregaokar 2015-11-07 22:40:18 +05:30 committed by Josh Matthews
parent bc618b0d53
commit dc0e467945
59 changed files with 1092 additions and 978 deletions

View file

@ -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"

View file

@ -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)]

View file

@ -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,
}
}
}

View file

@ -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),

View file

@ -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};