mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #6335

Browse Source 
6335: Fix panic context r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-10-23 13:19:09 +00:00 committed by GitHub
commit dd8a75b2cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/rust-analyzer/src/dispatch.rs
View File

@ -34,7 +34,7 @@ impl<'a> RequestDispatcher<'a> {
};
let world = panic::AssertUnwindSafe(&mut *self.global_state);
let response = panic::catch_unwind(move || {
stdx::panic_context::enter(format!("request: {} {:#?}", R::METHOD, params));
let _pctx = stdx::panic_context::enter(format!("request: {} {:#?}", R::METHOD, params));
let result = f(world.0, params);
result_to_response::<R>(id, result)
})
@ -64,7 +64,7 @@ impl<'a> RequestDispatcher<'a> {
let world = self.global_state.snapshot();
move || {
let _ctx =
let _pctx =
stdx::panic_context::enter(format!("request: {} {:#?}", R::METHOD, params));
let result = f(world, params);
Task::Response(result_to_response::<R>(id, result))
@ -160,7 +160,7 @@ impl<'a> NotificationDispatcher<'a> {
return Ok(self);
}
};
stdx::panic_context::enter(format!("notification: {}", N::METHOD));
let _pctx = stdx::panic_context::enter(format!("notification: {}", N::METHOD));
f(self.global_state, params)?;
Ok(self)
}

4
crates/stdx/src/panic_context.rs
View File

@ -4,7 +4,7 @@
use std::{cell::RefCell, panic, sync::Once};
pub fn enter(context: String) -> impl Drop {
pub fn enter(context: String) -> PanicContext {
static ONCE: Once = Once::new();
ONCE.call_once(PanicContext::init);
@ -13,7 +13,7 @@ pub fn enter(context: String) -> impl Drop {
}
#[must_use]
struct PanicContext {
pub struct PanicContext {
_priv: (),
}