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/gfx/Cargo.toml

@@ -20,7 +20,7 @@ fontsan = {git = "https://github.com/servo/fontsan"}
 gfx_traits = {path = "../gfx_traits"}
 harfbuzz-sys = "0.1"
 heapsize = "0.3.0"
-heapsize_plugin = "0.1.2"
+heapsize_derive = "0.1"
 ipc-channel = "0.5"
 lazy_static = "0.2"
 libc = "0.2"

components/gfx/lib.rs

@@ -16,7 +16,6 @@
 #![feature(structural_match)]
 #![feature(unique)]
 
-#![plugin(heapsize_plugin)]
 #![plugin(plugins)]
 
 #![deny(unsafe_code)]
@@ -55,6 +54,7 @@ extern crate gfx_traits;
 extern crate harfbuzz_sys as harfbuzz;
 
 extern crate heapsize;
+#[macro_use] extern crate heapsize_derive;
 extern crate ipc_channel;
 #[allow(unused_extern_crates)]
 #[macro_use]

components/gfx/platform/freetype/font_context.rs

@@ -99,7 +99,7 @@ impl HeapSizeOf for FreeTypeLibraryHandle {
     }
 }
 
-#[derive(Clone, HeapSizeOf, Debug)]
+#[derive(Clone, Debug)]
 pub struct FontContextHandle {
     // WARNING: FreeTypeLibraryHandle contains raw pointers, is clonable, and also implements
     // `Drop`. This field needs to be Rc<> to make sure that the `drop` function is only called
@@ -107,6 +107,12 @@ pub struct FontContextHandle {
     pub ctx: Rc<FreeTypeLibraryHandle>,
 }
 
+impl HeapSizeOf for FontContextHandle {
+    fn heap_size_of_children(&self) -> usize {
+        self.ctx.heap_size_of_children()
+    }
+}
+
 impl FontContextHandle {
     pub fn new() -> FontContextHandle {
         let user = Box::into_raw(box User {