language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

minor: nicer way to defeat disjoint closure captures

Browse source 
Thanks https://internals.rust-lang.org/t/feature-idea-edition-dependent-names-replacing-standard-library-items/15198/27?u=matklad!
This commit is contained in:
Aleksey Kladov 2021-08-26 22:11:54 +03:00
parent 55d4813561
commit cb3d04c818
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,8 +33,10 @@ impl<'a> RequestDispatcher<'a> {
let global_state = panic::AssertUnwindSafe(&mut *self.global_state); let global_state = panic::AssertUnwindSafe(&mut *self.global_state);
let result = panic::catch_unwind(move || { let result = panic::catch_unwind(move || {
let _ = &global_state; // Make sure that the whole AssertUnwindSafe is moved into the
let panic::AssertUnwindSafe(global_state) = global_state; // closure, and not just its field.
let panic::AssertUnwindSafe(global_state) = { global_state };
let _pctx = stdx::panic_context::enter(format!( let _pctx = stdx::panic_context::enter(format!(
"\nversion: {}\nrequest: {} {:#?}", "\nversion: {}\nrequest: {} {:#?}",
env!("REV"), env!("REV"),