auto merge of #13088 : thestinger/rust/hashmap, r=cmr

Closes #5283

src/test/run-pass/issue-12860.rs

@@ -14,7 +14,7 @@ extern crate collections;
 
 use collections::HashSet;
 
-#[deriving(Eq, Hash)]
+#[deriving(Eq, TotalEq, Hash)]
 struct XYZ {
     x: int,
     y: int,

src/test/run-pass/regions-mock-tcx.rs

@@ -42,6 +42,8 @@ impl<'tcx> Eq for TypeStructure<'tcx> {
     }
 }
 
+impl<'tcx> TotalEq for TypeStructure<'tcx> {}
+
 struct TypeContext<'tcx, 'ast> {
     ty_arena: &'tcx Arena,
     types: Vec<Type<'tcx>> ,
@@ -86,7 +88,7 @@ impl<'tcx,'ast> TypeContext<'tcx, 'ast> {
     }
 }
 
-#[deriving(Eq, Hash)]
+#[deriving(Eq, TotalEq, Hash)]
 struct NodeId {
     id: uint
 }