mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
auto merge of #4823 : Ms2ger/servo/warnings, r=jdm
This commit is contained in:
commit
1e72608f5c
3 changed files with 3 additions and 4 deletions
|
@ -11,7 +11,7 @@ use std::ops::{Add, Sub, Mul, Neg, Div, Rem, BitAnd, BitOr, BitXor, Shl, Shr, No
|
|||
use std::u16;
|
||||
use std::vec::Vec;
|
||||
use util::geometry::Au;
|
||||
use util::range::{mod, Range, RangeIndex, EachIndex};
|
||||
use util::range::{self, Range, RangeIndex, EachIndex};
|
||||
use util::vec::*;
|
||||
|
||||
/// GlyphEntry is a port of Gecko's CompressedGlyph scheme for storing glyph data compactly.
|
||||
|
|
|
@ -1558,7 +1558,6 @@ impl Fragment {
|
|||
inline_end);
|
||||
}
|
||||
|
||||
pieces_processed_count += 1;
|
||||
break
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ use std::collections::HashMap;
|
|||
use std::collections::hash_map::Entry::{Occupied, Vacant};
|
||||
use std::collections::hash_state::DefaultState;
|
||||
use rand::Rng;
|
||||
use std::hash::{Hash, SipHasher};
|
||||
use std::hash::{Hash, Hasher, SipHasher};
|
||||
use std::iter::repeat;
|
||||
use std::rand;
|
||||
use std::slice::Iter;
|
||||
|
@ -152,7 +152,7 @@ impl<K:Clone+Eq+Hash<SipHasher>,V:Clone> SimpleHashCache<K,V> {
|
|||
fn bucket_for_key<Q:Hash<SipHasher>>(&self, key: &Q) -> uint {
|
||||
let mut hasher = SipHasher::new_with_keys(self.k0, self.k1);
|
||||
key.hash(&mut hasher);
|
||||
self.to_bucket(hasher.result() as uint)
|
||||
self.to_bucket(hasher.finish() as uint)
|
||||
}
|
||||
|
||||
pub fn insert(&mut self, key: K, value: V) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue