Auto merge of #14028 - servo:rustup, r=nox,SimonSapin

Update Rust to 1.14.0-nightly (7c69b0d5a 2016-11-01)

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14028)
<!-- Reviewable:end -->

components/style/Cargo.toml

@@ -14,7 +14,7 @@ doctest = false
 
 [features]
 gecko = ["nsstring_vendor"]
-servo = ["serde/unstable", "serde", "serde_derive", "heapsize_plugin",
+servo = ["serde/unstable", "serde", "serde_derive", "heapsize_derive",
          "style_traits/servo", "app_units/plugins", "string_cache",
          "cssparser/heap_size", "cssparser/serde-serialization",
          "url/heap_size", "plugins", "parking_lot/nightly"]
@@ -30,7 +30,7 @@ encoding = "0.2"
 euclid = "0.10.1"
 fnv = "1.0"
 heapsize = "0.3.0"
-heapsize_plugin = {version = "0.1.2", optional = true}
+heapsize_derive = {version = "0.1", optional = true}
 lazy_static = "0.2"
 log = "0.3.5"
 libc = "0.2"

components/style/lib.rs

@@ -29,7 +29,6 @@
 #![cfg_attr(feature = "servo", feature(proc_macro))]
 #![cfg_attr(feature = "servo", feature(rustc_attrs))]
 #![cfg_attr(feature = "servo", feature(structural_match))]
-#![cfg_attr(feature = "servo", plugin(heapsize_plugin))]
 #![cfg_attr(feature = "servo", plugin(plugins))]
 
 #![deny(warnings)]
@@ -59,6 +58,7 @@ extern crate encoding;
 extern crate euclid;
 extern crate fnv;
 extern crate heapsize;
+#[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive;
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate lazy_static;