servo: Merge #13649 - Update to Rust 1.14.0-nightly (19ac57926 2016-10-08) (from servo:rustup); r=larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 39d3fce1af89bf30e201dcb873d7f2ffe0ad3d42
This commit is contained in:
Anthony Ramine
2016-10-09 20:12:38 -05:00
parent 6a499e2db0
commit a2454adeea
47 changed files with 390 additions and 361 deletions

View File

@@ -16,4 +16,4 @@ heapsize_plugin = "0.1.2"
num-traits = "0.1.32"
rustc-serialize = "0.3"
serde = "0.8"
serde_macros = "0.8"
serde_derive = "0.8"

View File

@@ -4,10 +4,11 @@
#![feature(custom_derive)]
#![feature(plugin)]
#![feature(proc_macro)]
#![feature(rustc_attrs)]
#![feature(step_trait)]
#![plugin(heapsize_plugin)]
#![plugin(serde_macros)]
#![deny(unsafe_code)]
@@ -15,6 +16,8 @@ extern crate heapsize;
extern crate num_traits;
extern crate rustc_serialize;
extern crate serde;
#[macro_use]
extern crate serde_derive;
use std::cmp::{self, max, min};
use std::fmt;