]> git.lizzy.rs Git - rust.git/commit
Auto merge of #24478 - alexcrichton:issue-24313, r=aturon
authorbors <bors@rust-lang.org>
Tue, 28 Apr 2015 00:44:56 +0000 (00:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 28 Apr 2015 00:44:56 +0000 (00:44 +0000)
commit2b8c9b12f91c0bf2c1e6278a5f803c2df3698432
treec50c1c6986dae1d4ae23335c43155888aacd8bc6
parent97d4e76c20ec2e80affd100dd169155914370fd2
parentd98ab4faf869ff0430ad73260b13ef8e473ef212
Auto merge of #24478 - alexcrichton:issue-24313, r=aturon

Inspecting the current thread's info may not always work due to the TLS value
having been destroyed (or is actively being destroyed). The code for printing
a panic message assumed, however, that it could acquire the thread's name
through this method.

Instead this commit propagates the `Option` outwards to allow the
`std::panicking` module to handle the case where the current thread isn't
present.

While it solves the immediate issue of #24313, there is still another underlying
issue of panicking destructors in thread locals will abort the process.

Closes #24313