bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix Unicode name mangling

Browse source 
`{` and `}` aren’t valid characters on ARM.

This also fixes a small bug where `)` (**r**ight **p**arenthesis) and `*`
(**r**aw **p**ointer) would both mangle to `$RP$`, making `)` show up as `*` in
backtraces.
This commit is contained in:
P1start 2015-01-22 20:12:57 +13:00
parent 7858cb432d
commit cfe18fb836
3 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstd/sys/common/backtrace.rs
View file

@ -107,9 +107,8 @@ pub fn demangle(writer: &mut Writer, s: &str) -> IoResult<()> {
// see src/librustc/back/link.rs for these mappings
demangle! (
"$SP$", => "@",
"$UP$", => "Box",
"$RP$", => "*",
"$BP$", => "&",
"$BP$", => "*",
"$RF$", => "&",
"$LT$", => "<",
"$GT$", => ">",
"$LP$", => "(",
@ -118,10 +117,11 @@ pub fn demangle(writer: &mut Writer, s: &str) -> IoResult<()> {
// in theory we can demangle any Unicode code point, but
// for simplicity we just catch the common ones.
"$u{20}", => " ",
"$u{27}", => "'",
"$u{5b}", => "[",
"$u{5d}", => "]"
"$u7e$", => "~",
"$u20$", => " ",
"$u27$", => "'",
"$u5b$", => "[",
"$u5d$", => "]"
)
} else {
let idx = match rest.find('$') {