about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-10 12:30:00 -0700
committerGitHub <noreply@github.com>2016-07-10 12:30:00 -0700
commit47b3a983406f91489f781ae8cbd45590423fa701 (patch)
tree2a027797e4423bed18f13eb15d03ec0e7e66330d /src/libstd/sys
parent6871b3f240a800650f544892e75dc5e8fb47bc5b (diff)
parent8511b6faf405a726bd0232fdffdd525326bcb001 (diff)
downloadrust-47b3a983406f91489f781ae8cbd45590423fa701.tar.gz
rust-47b3a983406f91489f781ae8cbd45590423fa701.zip
Auto merge of #34753 - sfackler:demangle-curly-braces, r=alexcrichton
Demangle curly braces

They show up in things like
fn(&std..panic..PanicInfo<'_>) $u7b$hook$u7d$::fn_pointer_shim.8352::h01f889b2277c719d

r? @alexcrichton
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/common/backtrace.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/sys/common/backtrace.rs b/src/libstd/sys/common/backtrace.rs
index 6f185437e50..4c23ceb63f2 100644
--- a/src/libstd/sys/common/backtrace.rs
+++ b/src/libstd/sys/common/backtrace.rs
@@ -170,7 +170,9 @@ pub fn demangle(writer: &mut Write, s: &str) -> io::Result<()> {
                         "$u20$", => b" ",
                         "$u27$", => b"'",
                         "$u5b$", => b"[",
-                        "$u5d$", => b"]"
+                        "$u5d$", => b"]",
+                        "$u7b$", => b"{",
+                        "$u7d$", => b"}"
                     )
                 } else {
                     let idx = match rest.find('$') {