diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 55716acf357f..948263f4b3fa 100644 --- a/src/comp/back/link.rs +++ b/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 diff --git a/src/comp/metadata/encoder.rs b/src/comp/metadata/encoder.rs index fdde5ebb8380..b505f5fb87b3 100644 --- a/src/comp/metadata/encoder.rs +++ b/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); diff --git a/src/comp/util/ppaux.rs b/src/comp/util/ppaux.rs index a3963f94c428..381b595435b7 100644 --- a/src/comp/util/ppaux.rs +++ b/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; }