---

yaml
---
r: 24025
b: refs/heads/master
c: bac89ea
h: refs/heads/master
i:
  24023: 1810748
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c6ed447221303be59381f91852e0fcd50f60be06
+refs/heads/master: bac89eae4844f030b0b3e219e114a1b79212fe7f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/metadata/common.rs

@@ -123,16 +123,5 @@ enum astencode_tag { // Reserves 0x50 -- 0x6f
     tag_table_adjustments = 0x62
 }
 
-// djb's cdb hashes.
-fn hash_node_id(&&node_id: int) -> uint {
-    return 177573u ^ (node_id as uint);
-}
-
-fn hash_path(&&s: ~str) -> uint {
-    let mut h = 5381u;
-    for str::each(s) |ch| { h = (h << 5u) + h ^ (ch as uint); }
-    return h;
-}
-
 type link_meta = {name: ~str, vers: ~str, extras_hash: ~str};
 

trunk/src/rustc/metadata/decoder.rs

@@ -16,7 +16,7 @@ use util::ppaux::ty_to_str;
 use syntax::diagnostic::span_handler;
 use common::*;
 use syntax::parse::token::ident_interner;
-
+use hash::{Hash, HashUtil};
 
 export class_dtor;
 export get_class_fields;
@@ -88,7 +88,7 @@ fn maybe_find_item(item_id: int, items: ebml::Doc) -> Option<ebml::Doc> {
     }
     lookup_hash(items,
                 |a| eq_item(a, item_id),
-                hash_node_id(item_id))
+                item_id.hash() as uint)
 }
 
 fn find_item(item_id: int, items: ebml::Doc) -> ebml::Doc {

trunk/src/rustc/metadata/encoder.rs

@@ -20,6 +20,9 @@ use str::to_bytes;
 use syntax::ast;
 use syntax::diagnostic::span_handler;
 
+use hash::{Hash, HashUtil};
+use to_bytes::IterBytes;
+
 export encode_parms;
 export encode_metadata;
 export encoded_ty;
@@ -679,7 +682,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::Writer, item: @item,
            }
         }
         /* Each class has its own index -- encode it */
-        let bkts = create_index(idx, hash_node_id);
+        let bkts = create_index(idx);
         encode_index(ebml_w, bkts, write_int);
         ebml_w.end_tag();
 
@@ -865,13 +868,13 @@ fn encode_info_for_items(ecx: @encode_ctxt, ebml_w: ebml::Writer,
 
 // Path and definition ID indexing
 
-fn create_index<T: Copy>(index: ~[entry<T>], hash_fn: fn@(T) -> uint) ->
+fn create_index<T: Copy Hash IterBytes>(index: ~[entry<T>]) ->
    ~[@~[entry<T>]] {
     let mut buckets: ~[@mut ~[entry<T>]] = ~[];
     for uint::range(0u, 256u) |_i| { vec::push(buckets, @mut ~[]); };
     for index.each |elt| {
-        let h = hash_fn(elt.val);
-        vec::push(*buckets[h % 256u], elt);
+        let h = elt.val.hash() as uint;
+        vec::push(*buckets[h % 256], elt);
     }
 
     let mut buckets_frozen = ~[];
@@ -1135,7 +1138,7 @@ fn encode_metadata(parms: encode_parms, crate: @crate) -> ~[u8] {
     ecx.stats.item_bytes = wr.pos - i;
 
     i = wr.pos;
-    let items_buckets = create_index(items_index, hash_node_id);
+    let items_buckets = create_index(items_index);
     encode_index(ebml_w, items_buckets, write_int);
     ecx.stats.index_bytes = wr.pos - i;
     ebml_w.end_tag();