---

yaml
---
r: 102078
b: refs/heads/master
c: d223dd1
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0135b521ad38615e9a07aac54d9c22627af57ca4
+refs/heads/master: d223dd1e57cc412aa2eff28e6604f86b9f013083
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/etc/generate-deriving-span-tests.py

@@ -119,7 +119,8 @@ def write_file(name, string):
                               ('Clone', [], 1), ('DeepClone', ['Clone'], 1),
                               ('Eq', [], 2), ('Ord', [], 8),
                               ('TotalEq', [], 1), ('TotalOrd', ['TotalEq'], 1),
-                              ('Show', [], 1)]:
+                              ('Show', [], 1),
+                              ('Hash', [], 1)]:
     traits[trait] = (ALL, supers, errs)
 
 for (trait, (types, super_traits, error_count)) in traits.items():

trunk/src/libextra/stats.rs

@@ -11,6 +11,7 @@
 #[allow(missing_doc)];
 
 use std::cmp;
+use std::hash_old::Hash;
 use std::hashmap;
 use std::io;
 use std::mem;

trunk/src/librustc/metadata/decoder.rs

@@ -27,6 +27,7 @@ use middle::typeck;
 use middle::astencode::vtable_decoder_helpers;
 
 use std::u64;
+use std::hash_old::Hash;
 use std::io;
 use std::io::extensions::u64_from_be_bytes;
 use std::option;

trunk/src/librustc/metadata/encoder.rs

@@ -26,6 +26,7 @@ use middle;
 use serialize::Encodable;
 use std::cast;
 use std::cell::{Cell, RefCell};
+use std::hash_old::Hash;
 use std::hashmap::{HashMap, HashSet};
 use std::io::MemWriter;
 use std::str;

trunk/src/librustc/middle/ty.rs

@@ -4916,7 +4916,7 @@ pub fn trait_method_of_method(tcx: ctxt,
 /// Creates a hash of the type `t` which will be the same no matter what crate
 /// context it's calculated within. This is used by the `type_id` intrinsic.
 pub fn hash_crate_independent(tcx: ctxt, t: t, local_hash: ~str) -> u64 {
-    use std::hash::{SipState, Streaming};
+    use std::hash_old::{SipState, Streaming};
 
     let mut hash = SipState::new(0, 0);
     let region = |_hash: &mut SipState, r: Region| {

trunk/src/libserialize/serialize.rs

@@ -14,6 +14,7 @@
 Core encoding and decoding interfaces.
 */
 
+use std::hash_old::Hash;
 use std::hashmap::{HashMap, HashSet};
 use std::rc::Rc;
 use std::trie::{TrieMap, TrieSet};