---

yaml
---
r: 3687
b: refs/heads/master
c: 6ee1ffe
h: refs/heads/master
i:
  3685: d9ab493
  3683: 2cf09d3
  3679: 24cf6a7
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de88739350873142d10ffed0ec1ab6600eac20b8
+refs/heads/master: 6ee1ffe4ac5918b094098589f75188e13dc8a791

trunk/src/comp/back/link.rs

@@ -408,7 +408,7 @@ fn symbol_hash(ty::ctxt tcx, sha1 sha, &ty::t t,
     // FIXME: This wants to be link_meta.meta_hash
     sha.input_str(link_meta.name);
     sha.input_str("-");
-    sha.input_str(encoder::ty_str(tcx, t));
+    sha.input_str(encoder::encoded_ty(tcx, t));
     auto hash = truncated_sha1_result(sha);
     // Prefix with _ so that it never blends into adjacent digits
 

trunk/src/comp/metadata/encoder.rs

@@ -17,7 +17,7 @@ import middle::ty::node_id_to_monotype;
 import front::attr;
 
 export encode_metadata;
-export ty_str;
+export encoded_ty;
 
 // Path table encoding
 fn encode_name(&ebml::writer ebml_w, &str name) {
@@ -541,7 +541,7 @@ fn encode_metadata(&@crate_ctxt cx, &@crate crate) -> str {
 }
 
 // Get the encoded string for a type
-fn ty_str(&ty::ctxt tcx, &ty::t t) -> str {
+fn encoded_ty(&ty::ctxt tcx, &ty::t t) -> str {
     auto cx = @rec(ds = def_to_str,
                    tcx = tcx,
                    abbrevs = metadata::tyencode::ac_no_abbrevs);

trunk/src/comp/util/ppaux.rs

@@ -152,7 +152,7 @@ fn ty_to_str(&ctxt cx, &t typ) -> str {
 }
 
 fn ty_to_short_str(&ctxt cx, t typ) -> str {
-    auto s = encoder::ty_str(cx, typ);
+    auto s = encoder::encoded_ty(cx, typ);
     if (str::byte_len(s) >= 32u) { s = str::substr(s, 0u, 32u); }
     ret s;
 }