]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita268a1c4bb3867e4f8b050e07fd216e561b50521
tree7be5f74714167f8fa65c397f28bdb0e0b6028253tree | snapshot
parent5adfa1038787cb042ca5bbe634082201d71a3b72commit | diff
parent324418f32bd0d82f20dd79327dff1e3c78b719d2commit | diff
auto merge of #9490 : alexcrichton/rust/issue-9487, r=cmr

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
Empowering everyone to build reliable and efficient software.