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

auto merge of #4823 : Ms2ger/servo/warnings, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-02-03 17:57:51 -07:00
commit 1e72608f5c
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/text/glyph.rs
View file

@ -11,7 +11,7 @@ use std::ops::{Add, Sub, Mul, Neg, Div, Rem, BitAnd, BitOr, BitXor, Shl, Shr, No
use std::u16; use std::u16;
use std::vec::Vec; use std::vec::Vec;
use util::geometry::Au; use util::geometry::Au;
use util::range::{mod, Range, RangeIndex, EachIndex}; use util::range::{self, Range, RangeIndex, EachIndex};
use util::vec::*; use util::vec::*;
/// GlyphEntry is a port of Gecko's CompressedGlyph scheme for storing glyph data compactly. /// GlyphEntry is a port of Gecko's CompressedGlyph scheme for storing glyph data compactly.

1
components/layout/fragment.rs
View file

@ -1558,7 +1558,6 @@ impl Fragment {
inline_end); inline_end);
} }
pieces_processed_count += 1;
break break
} }

4
components/util/cache.rs
View file

@ -8,7 +8,7 @@ use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant}; use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::collections::hash_state::DefaultState; use std::collections::hash_state::DefaultState;
use rand::Rng; use rand::Rng;
use std::hash::{Hash, SipHasher}; use std::hash::{Hash, Hasher, SipHasher};
use std::iter::repeat; use std::iter::repeat;
use std::rand; use std::rand;
use std::slice::Iter; 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 { fn bucket_for_key<Q:Hash<SipHasher>>(&self, key: &Q) -> uint {
let mut hasher = SipHasher::new_with_keys(self.k0, self.k1); let mut hasher = SipHasher::new_with_keys(self.k0, self.k1);
key.hash(&mut hasher); 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) { pub fn insert(&mut self, key: K, value: V) {