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

use unwinding for cancelation

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-10 12:20:32 +03:00
parent cf20ecae9f
commit 64455ad701
6 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ra_db/src/lib.rs
View file

@ -20,10 +20,10 @@ pub use crate::{
loc2id::LocationIntener,
};
pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe {
pub trait BaseDatabase: salsa::Database {
fn check_canceled(&self) -> Cancelable<()> {
self.salsa_runtime()
.unwind_if_current_revision_is_canceled();
.if_current_revision_is_canceled(Canceled::throw);
Ok(())
}
@ -31,8 +31,9 @@ pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe {
&self,
f: F,
) -> Result<T, Canceled> {
panic::catch_unwind(|| f(self)).map_err(|err| match err.downcast::<salsa::Canceled>() {
Ok(_) => Canceled::new(),
let me = panic::AssertUnwindSafe(self);
panic::catch_unwind(|| f(me.0)).map_err(|err| match err.downcast::<Canceled>() {
Ok(canceled) => *canceled,
Err(payload) => panic::resume_unwind(payload),
})
}