From 1448fc1a24eedc089f4fb8abc7607f9e1b06c114 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 10 May 2011 17:49:20 -0700 Subject: rustc: Lower the size limit on ty_to_short_str() and always call it in favor of direct calls to metadata.Encode.ty_str() in trans --- src/comp/middle/trans.rs | 2 +- src/comp/middle/ty.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/comp') diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 98e3b14e..4f9de496 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -210,7 +210,7 @@ fn mangle_name_by_type(@crate_ctxt ccx, vec[str] path, ty.t t) -> str { fn mangle_name_by_type_only(@crate_ctxt ccx, ty.t t, str name) -> str { auto f = metadata.def_to_str; auto cx = @rec(ds=f, tcx=ccx.tcx, abbrevs=metadata.ac_no_abbrevs); - auto s = metadata.Encode.ty_str(cx, t); + auto s = ty.ty_to_short_str(ccx.tcx, t); auto hash = get_type_sha1(ccx, t); ret sep() + "rust" + sep() + hash + sep() + name + "_" + s; diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index 5c2dc425..455e280a 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -661,7 +661,7 @@ fn ty_to_short_str(ctxt cx, t typ) -> str { auto f = def_to_str; auto ecx = @rec(ds=f, tcx=cx, abbrevs=metadata.ac_no_abbrevs); auto s = metadata.Encode.ty_str(ecx, typ); - if (Str.byte_len(s) >= 64u) { s = Str.substr(s, 0u, 64u); } + if (Str.byte_len(s) >= 32u) { s = Str.substr(s, 0u, 32u); } ret s; } -- cgit v1.2.3