diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 18:10:13 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 18:10:13 +0000 |
commit | 6fba078ab693ec79e887b64e92a7ed3a21e29728 (patch) | |
tree | b97ae214a8616def416b64fb07287ac66554ed3a /crates/ra_db | |
parent | 05ed6c548a7672e2c9472276a652c374a5d2a212 (diff) | |
parent | 0bb170a277582f5f17c21cddd27a11f19750fa36 (diff) |
Merge #557
557: remove Canceled from impl of ra_ide_api r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_db')
-rw-r--r-- | crates/ra_db/src/cancellation.rs | 2 | ||||
-rw-r--r-- | crates/ra_db/src/lib.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/crates/ra_db/src/cancellation.rs b/crates/ra_db/src/cancellation.rs index 32a268553..439080075 100644 --- a/crates/ra_db/src/cancellation.rs +++ b/crates/ra_db/src/cancellation.rs | |||
@@ -21,8 +21,6 @@ pub struct Canceled { | |||
21 | _private: (), | 21 | _private: (), |
22 | } | 22 | } |
23 | 23 | ||
24 | pub type Cancelable<T> = Result<T, Canceled>; | ||
25 | |||
26 | impl Canceled { | 24 | impl Canceled { |
27 | pub(crate) fn new() -> Canceled { | 25 | pub(crate) fn new() -> Canceled { |
28 | Canceled { _private: () } | 26 | Canceled { _private: () } |
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs index 8473fc050..89113e7a6 100644 --- a/crates/ra_db/src/lib.rs +++ b/crates/ra_db/src/lib.rs | |||
@@ -10,7 +10,7 @@ use std::panic; | |||
10 | use ra_syntax::{TextUnit, TextRange, SourceFile, TreeArc}; | 10 | use ra_syntax::{TextUnit, TextRange, SourceFile, TreeArc}; |
11 | 11 | ||
12 | pub use crate::{ | 12 | pub use crate::{ |
13 | cancellation::{Canceled, Cancelable}, | 13 | cancellation::Canceled, |
14 | syntax_ptr::LocalSyntaxPtr, | 14 | syntax_ptr::LocalSyntaxPtr, |
15 | input::{ | 15 | input::{ |
16 | FilesDatabase, FileId, CrateId, SourceRoot, SourceRootId, CrateGraph, Dependency, | 16 | FilesDatabase, FileId, CrateId, SourceRoot, SourceRootId, CrateGraph, Dependency, |