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

add cancelation module & cancelation backtraces

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-27 12:59:30 +03:00
parent 62c40b0e91
commit 93996fecdc
5 changed files with 92 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,27 +1,17 @@
//! ra_db defines basic database traits. Concrete DB is defined by ra_analysis.
mod cancelation;
mod syntax_ptr;
mod input;
mod loc2id;
pub mod mock;
use std::sync::Arc;
use ra_editor::LineIndex;
use ra_syntax::{TextUnit, SourceFileNode};
#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct Canceled;
pub type Cancelable<T> = Result<T, Canceled>;
impl std::fmt::Display for Canceled {
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
fmt.write_str("canceled")
}
}
impl std::error::Error for Canceled {}
pub use crate::{
cancelation::{Canceled, Cancelable},
syntax_ptr::LocalSyntaxPtr,
input::{
FilesDatabase, FileId, CrateId, SourceRoot, SourceRootId, CrateGraph,
@ -48,7 +38,7 @@ macro_rules! impl_numeric_id {
pub trait BaseDatabase: salsa::Database {
fn check_canceled(&self) -> Cancelable<()> {
if self.salsa_runtime().is_current_revision_canceled() {
Err(Canceled)
Err(Canceled::new())
} else {
Ok(())
}