diff options
author | Aleksey Kladov <[email protected]> | 2018-10-20 20:35:55 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-10-20 20:35:55 +0100 |
commit | 8eea10e3ab25111375a95990b93d1170d5fe8a9f (patch) | |
tree | 469ec771c1e1d3608518557f05d175703dec85d9 /crates/ra_analysis/src/lib.rs | |
parent | 71cbdddf1c6b6c34c05aea01b92bb8a105b32c71 (diff) |
actually check for cancelation
Diffstat (limited to 'crates/ra_analysis/src/lib.rs')
-rw-r--r-- | crates/ra_analysis/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index 189dbd9c2..03708d450 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs | |||
@@ -38,17 +38,17 @@ pub use ra_editor::{ | |||
38 | }; | 38 | }; |
39 | 39 | ||
40 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] | 40 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] |
41 | pub struct Cancel; | 41 | pub struct Canceled; |
42 | 42 | ||
43 | pub type Cancelable<T> = Result<T, Cancel>; | 43 | pub type Cancelable<T> = Result<T, Canceled>; |
44 | 44 | ||
45 | impl std::fmt::Display for Cancel { | 45 | impl std::fmt::Display for Canceled { |
46 | fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | 46 | fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { |
47 | fmt.write_str("Canceled") | 47 | fmt.write_str("Canceled") |
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | impl std::error::Error for Cancel { | 51 | impl std::error::Error for Canceled { |
52 | } | 52 | } |
53 | 53 | ||
54 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] | 54 | #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] |