]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5adfa10 324418f)
auto merge of #9490 : alexcrichton/rust/issue-9487, r=cmr
authorbors <bors@rust-lang.org>
Thu, 26 Sep 2013 07:30:57 +0000 (00:30 -0700)
committerbors <bors@rust-lang.org>
Thu, 26 Sep 2013 07:30:57 +0000 (00:30 -0700)
If there's no TLS key just yet, then there's nothing to unsafely borrow, so
continue returning None. This prevents causing the runtime to abort itself when
logging before the runtime is fully initialized.

Closes #9487

r? @brson


Trivial merge
Empowering everyone to build reliable and efficient software.