---

yaml
---
r: 3382
b: refs/heads/master
c: 33294c7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 279a229414bea59804548f8c7606c518a15261e2
+refs/heads/master: 33294c7293f101d3a0fd02aeb8976751e343f46f

trunk/src/comp/back/link.rs

@@ -398,7 +398,7 @@ fn symbol_hash(ty::ctxt tcx, sha1 sha, &ty::t t, str crate_meta_name,
     // to be independent of one another in the crate.
 
     auto cx =
-        @rec(ds=metadata::cwriter::def_to_str,
+        @rec(ds=metadata::encoder::def_to_str,
              tcx=tcx,
              abbrevs=metadata::tyencode::ac_no_abbrevs);
     sha.reset();
@@ -452,7 +452,6 @@ fn mangle_exported_name(&@crate_ctxt ccx, &vec[str] path, &ty::t t) -> str {
 
 fn mangle_internal_name_by_type_only(&@crate_ctxt ccx, &ty::t t, &str name) ->
    str {
-    auto f = metadata::cwriter::def_to_str;
     auto s = pretty::ppaux::ty_to_short_str(ccx.tcx, t);
     auto hash = get_symbol_hash(ccx, t);
     ret mangle([name, s, hash]);

trunk/src/comp/metadata/creader.rs

@@ -435,7 +435,7 @@ fn resolve_path(vec[ast::ident] path, vec[u8] data) -> vec[ast::def_id] {
     auto paths = ebml::get_doc(md, tag_paths);
     auto eqer = bind eq_item(_, s);
     let vec[ast::def_id] result = [];
-    for (ebml::doc doc in lookup_hash(paths, eqer, cwriter::hash_path(s))) {
+    for (ebml::doc doc in lookup_hash(paths, eqer, encoder::hash_path(s))) {
         auto did_doc = ebml::get_doc(doc, tag_def_id);
         vec::push(result, parse_def_id(ebml::doc_data(did_doc)));
     }
@@ -447,7 +447,7 @@ fn maybe_find_item(int item_id, &ebml::doc items) -> option::t[ebml::doc] {
         ret ebml::be_uint_from_bytes(bytes, 0u, 4u) as int == item_id;
     }
     auto eqer = bind eq_item(_, item_id);
-    auto found = lookup_hash(items, eqer, cwriter::hash_def_id(item_id));
+    auto found = lookup_hash(items, eqer, encoder::hash_def_id(item_id));
     if (vec::len(found) == 0u) {
         ret option::none[ebml::doc];
     } else { ret option::some[ebml::doc](found.(0)); }