---

yaml
---
r: 15998
b: refs/heads/try
c: f9d0cde
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 4756556748fe7fa247c02f36dc481c8eeae9908d
+refs/heads/try: f9d0cde19a38f5f5e15183c53c278bd7d7d9d856
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/ast_util.rs

@@ -242,18 +242,6 @@ fn new_def_hash<V: copy>() -> std::map::hashmap<ast::def_id, V> {
     ret std::map::hashmap::<ast::def_id, V>(hasher, eqer);
 }
 
-fn hash_def_id(&&id: def_id) -> uint {
-    (id.crate as uint << 16u) + (id.node as uint)
-}
-
-fn eq_def_id(&&a: def_id, &&b: def_id) -> bool {
-    a == b
-}
-
-fn new_def_id_hash<T: copy>() -> std::map::hashmap<def_id, T> {
-    std::map::hashmap(hash_def_id, eq_def_id)
-}
-
 fn block_from_expr(e: @expr) -> blk {
     let blk_ = default_block([], option::some::<@expr>(e), e.id);
     ret {node: blk_, span: e.span};

branches/try/src/rustc/middle/trans/base.rs

@@ -5489,12 +5489,12 @@ fn trans_crate(sess: session::session, crate: @ast::crate, tcx: ty::ctxt,
           mut main_fn: none::<ValueRef>,
           link_meta: link_meta,
           enum_sizes: ty::new_ty_hash(),
-          discrims: ast_util::new_def_id_hash::<ValueRef>(),
+          discrims: ast_util::new_def_hash::<ValueRef>(),
           discrim_symbols: int_hash::<str>(),
           tydescs: ty::new_ty_hash(),
           external: ast_util::new_def_hash(),
           monomorphized: map::hashmap(hash_mono_id, {|a, b| a == b}),
-          monomorphizing: ast_util::new_def_id_hash(),
+          monomorphizing: ast_util::new_def_hash(),
           type_use_cache: ast_util::new_def_hash(),
           vtables: map::hashmap(hash_mono_id, {|a, b| a == b}),
           const_cstr_cache: map::str_hash(),

branches/try/src/rustc/middle/trans/common.rs

@@ -874,7 +874,7 @@ enum mono_param_id {
 }
 type mono_id = @{def: ast::def_id, params: [mono_param_id]};
 fn hash_mono_id(&&mi: mono_id) -> uint {
-    let mut h = syntax::ast_util::hash_def_id(mi.def);
+    let mut h = syntax::ast_util::hash_def(mi.def);
     for vec::each(mi.params) {|param|
         h = h * alt param {
           mono_precise(ty, vts) {

branches/try/src/rustc/middle/ty.rs

@@ -465,7 +465,7 @@ fn mk_ctxt(s: session::session, dm: resolve::def_map, amap: ast_map::map,
            region_map: middle::region::region_map) -> ctxt {
     let interner = map::hashmap({|&&k: intern_key|
         hash_type_structure(k.struct) +
-            option::map_default(k.o_def_id, 0u, ast_util::hash_def_id)
+            option::map_default(k.o_def_id, 0u, ast_util::hash_def)
     }, {|&&a, &&b| a == b});
     @{diag: s.diagnostic(),
       interner: interner,