Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.

components/layout/css/matching.rs

@@ -11,13 +11,13 @@ use wrapper::{LayoutElement, LayoutNode, TLayoutNode};
 
 use script::dom::node::NodeTypeId;
 use servo_util::bloom::BloomFilter;
-use servo_util::cache::{Cache, LRUCache, SimpleHashCache};
+use servo_util::cache::{LRUCache, SimpleHashCache};
 use servo_util::smallvec::{SmallVec, SmallVec16};
 use servo_util::arc_ptr_eq;
 use std::borrow::ToOwned;
 use std::mem;
-use std::hash::{Hash, sip};
-use std::slice::Items;
+use std::hash::{Hash, Hasher, Writer};
+use std::slice::Iter;
 use string_cache::{Atom, Namespace};
 use style::{mod, PseudoElement, ComputedValues, DeclarationBlock, Stylist, TElement, TNode};
 use style::{CommonStyleAffectingAttributeMode, CommonStyleAffectingAttributes, cascade};
@@ -50,7 +50,7 @@ impl ApplicableDeclarations {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct ApplicableDeclarationsCacheEntry {
     pub declarations: Vec<DeclarationBlock>,
 }
@@ -66,12 +66,13 @@ impl ApplicableDeclarationsCacheEntry {
 impl PartialEq for ApplicableDeclarationsCacheEntry {
     fn eq(&self, other: &ApplicableDeclarationsCacheEntry) -> bool {
         let this_as_query = ApplicableDeclarationsCacheQuery::new(self.declarations.as_slice());
-        this_as_query.equiv(other)
+        this_as_query.eq(other)
     }
 }
+impl Eq for ApplicableDeclarationsCacheEntry {}
 
-impl Hash for ApplicableDeclarationsCacheEntry {
-    fn hash(&self, state: &mut sip::SipState) {
+impl<H: Hasher+Writer> Hash<H> for ApplicableDeclarationsCacheEntry {
+    fn hash(&self, state: &mut H) {
         let tmp = ApplicableDeclarationsCacheQuery::new(self.declarations.as_slice());
         tmp.hash(state);
     }
@@ -89,8 +90,8 @@ impl<'a> ApplicableDeclarationsCacheQuery<'a> {
     }
 }
 
-impl<'a> Equiv<ApplicableDeclarationsCacheEntry> for ApplicableDeclarationsCacheQuery<'a> {
-    fn equiv(&self, other: &ApplicableDeclarationsCacheEntry) -> bool {
+impl<'a> PartialEq for ApplicableDeclarationsCacheQuery<'a> {
+    fn eq(&self, other: &ApplicableDeclarationsCacheQuery<'a>) -> bool {
         if self.declarations.len() != other.declarations.len() {
             return false
         }
@@ -102,10 +103,17 @@ impl<'a> Equiv<ApplicableDeclarationsCacheEntry> for ApplicableDeclarationsCache
         return true
     }
 }
+impl<'a> Eq for ApplicableDeclarationsCacheQuery<'a> {}
 
+impl<'a> PartialEq<ApplicableDeclarationsCacheEntry> for ApplicableDeclarationsCacheQuery<'a> {
+    fn eq(&self, other: &ApplicableDeclarationsCacheEntry) -> bool {
+        let other_as_query = ApplicableDeclarationsCacheQuery::new(other.declarations.as_slice());
+        self.eq(&other_as_query)
+    }
+}
 
-impl<'a> Hash for ApplicableDeclarationsCacheQuery<'a> {
-    fn hash(&self, state: &mut sip::SipState) {
+impl<'a, H: Hasher+Writer> Hash<H> for ApplicableDeclarationsCacheQuery<'a> {
+    fn hash(&self, state: &mut H) {
         for declaration in self.declarations.iter() {
             let ptr: uint = unsafe {
                 mem::transmute_copy(declaration)
@@ -129,7 +137,7 @@ impl ApplicableDeclarationsCache {
     }
 
     fn find(&self, declarations: &[DeclarationBlock]) -> Option<Arc<ComputedValues>> {
-        match self.cache.find_equiv(&ApplicableDeclarationsCacheQuery::new(declarations)) {
+        match self.cache.find(&ApplicableDeclarationsCacheQuery::new(declarations)) {
             None => None,
             Some(ref values) => Some((*values).clone()),
         }
@@ -168,7 +176,7 @@ fn create_common_style_affecting_attributes_from_element(element: &LayoutElement
     flags
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct StyleSharingCandidate {
     pub style: Arc<ComputedValues>,
     pub parent_style: Arc<ComputedValues>,
@@ -321,7 +329,7 @@ impl StyleSharingCandidateCache {
         }
     }
 
-    pub fn iter<'a>(&'a self) -> Items<'a,(StyleSharingCandidate,())> {
+    pub fn iter<'a>(&'a self) -> Iter<'a,(StyleSharingCandidate,())> {
         self.cache.iter()
     }
 
@@ -608,8 +616,8 @@ impl<'ln> MatchMethods for LayoutNode<'ln> {
 
         let mut layout_data_ref = self.mutate_layout_data();
         match &mut *layout_data_ref {
-            &None => panic!("no layout data"),
-            &Some(ref mut layout_data) => {
+            &mut None => panic!("no layout data"),
+            &mut Some(ref mut layout_data) => {
                 match self.type_id() {
                     Some(NodeTypeId::Text) => {
                         // Text nodes get a copy of the parent style. This ensures