Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump Rust to 2016-01-31 nightly

Browse source
This commit is contained in:
Anthony Ramine 2016-01-29 02:03:50 +01:00 • committed by Ms2ger
parent e7371b36dd
commit 436b952298
9 changed files with 81 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/util/mem.rs
View file

@ -19,8 +19,8 @@ use range::Range;
use selectors::parser::{Combinator, CompoundSelector, PseudoElement, Selector, SimpleSelector};
use selectors::states::ElementState;
use std::cell::{Cell, RefCell};
use std::collections::{HashMap, LinkedList, hash_state};
use std::hash::Hash;
use std::collections::{HashMap, LinkedList};
use std::hash::{BuildHasher, Hash};
use std::mem::{size_of, transmute};
use std::rc::Rc;
use std::result::Result;
@ -194,7 +194,7 @@ impl<T> HeapSizeOf for Vec<Rc<T>> {
}
impl<K: HeapSizeOf, V: HeapSizeOf, S> HeapSizeOf for HashMap<K, V, S>
where K: Eq + Hash, S: hash_state::HashState {
where K: Eq + Hash, S: BuildHasher {
fn heap_size_of_children(&self) -> usize {
//TODO(#6908) measure actual bucket memory usage instead of approximating
let size = self.capacity() * (size_of::<V>() + size_of::<K>());