servo: Merge #4823 - Fix build warnings (from Ms2ger:warnings); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 1e72608f5c1d96cfcabdd993d973f4580e2fdb54

servo/components/gfx/text/glyph.rs

@@ -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.

servo/components/layout/fragment.rs

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

servo/components/util/cache.rs

@@ -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) {