diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-23 14:19:09 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-23 14:19:09 +0100 |
commit | dd8a75b2cf46a967b3449652fe17c19a8fcc4e41 (patch) | |
tree | 5c7a8b98a80091eeb2192fa572c52ff617238472 /crates/stdx | |
parent | 81609960fa30ea92e37b23dc7b025d1939626812 (diff) | |
parent | 1a74f25f9026f152fdba6f85ec617c02205d98eb (diff) |
Merge #6335
6335: Fix panic context r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/stdx')
-rw-r--r-- | crates/stdx/src/panic_context.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/stdx/src/panic_context.rs b/crates/stdx/src/panic_context.rs index fd232e0cc..8d51e20d3 100644 --- a/crates/stdx/src/panic_context.rs +++ b/crates/stdx/src/panic_context.rs | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | use std::{cell::RefCell, panic, sync::Once}; | 5 | use std::{cell::RefCell, panic, sync::Once}; |
6 | 6 | ||
7 | pub fn enter(context: String) -> impl Drop { | 7 | pub fn enter(context: String) -> PanicContext { |
8 | static ONCE: Once = Once::new(); | 8 | static ONCE: Once = Once::new(); |
9 | ONCE.call_once(PanicContext::init); | 9 | ONCE.call_once(PanicContext::init); |
10 | 10 | ||
@@ -13,7 +13,7 @@ pub fn enter(context: String) -> impl Drop { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | #[must_use] | 15 | #[must_use] |
16 | struct PanicContext { | 16 | pub struct PanicContext { |
17 | _priv: (), | 17 | _priv: (), |
18 | } | 18 | } |
19 | 19 | ||