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 -->
This commit is contained in:
bors-servo 2016-11-02 21:49:08 -05:00 committed by GitHub
commit c6e15f8ef2
40 changed files with 447 additions and 331 deletions

View file

@ -625,6 +625,12 @@ impl<T: Reflectable> Deref for Root<T> {
}
}
impl<T: Reflectable + HeapSizeOf> HeapSizeOf for Root<T> {
fn heap_size_of_children(&self) -> usize {
(**self).heap_size_of_children()
}
}
impl<T: Reflectable> PartialEq for Root<T> {
fn eq(&self, other: &Self) -> bool {
self.ptr == other.ptr

View file

@ -4,6 +4,7 @@
//! The `Finite<T>` struct.
use heapsize::HeapSizeOf;
use num_traits::Float;
use std::ops::Deref;
@ -38,3 +39,9 @@ impl<T: Float> Deref for Finite<T> {
value
}
}
impl<T: Float + HeapSizeOf> HeapSizeOf for Finite<T> {
fn heap_size_of_children(&self) -> usize {
(**self).heap_size_of_children()
}
}