aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-25 10:40:42 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-25 10:40:42 +0000
commit5fb426cb9eeefa69a53d7c8c3367f7c6b714b9b8 (patch)
tree267cdf1dad05aee32c813dc5d4681a032f0990a4
parent64046253a3386962b49632edc6edf9f05272d404 (diff)
parent8d49c098a56098345aa7c42cefff0d425d44c05d (diff)
Merge #331
331: Cancelled is not Copy r=matklad a=matklad I'd love to have a backtrace in `Cancelled` to be able to debug "completion is always cancelled" problem. So it probably is a good idea to make `Cancelled` non Copy type, even if it is a ZST in prod. Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--crates/ra_db/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 0aca6f343..78f2cbf12 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -8,7 +8,7 @@ use std::sync::Arc;
8use ra_editor::LineIndex; 8use ra_editor::LineIndex;
9use ra_syntax::{TextUnit, SourceFileNode}; 9use ra_syntax::{TextUnit, SourceFileNode};
10 10
11#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] 11#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
12pub struct Canceled; 12pub struct Canceled;
13 13
14pub type Cancelable<T> = Result<T, Canceled>; 14pub type Cancelable<T> = Result<T, Canceled>;