aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-21 08:09:36 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-21 08:09:36 +0000
commitf897de5b783bacc3e6ea796ef8f3e60f4b8ac808 (patch)
treeb7d8a8e2127ffc8e9e2e8848d67368e6d8247635 /crates
parentf1fafeee02b88ac7186e479ec595f66d056f842c (diff)
parentb7d8bf12622f25a3c96f50b4079132718ea404db (diff)
Merge #308
308: tweak canceled message r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_db/src/lib.rs2
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 65fa3cbfa..0aca6f343 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -15,7 +15,7 @@ pub type Cancelable<T> = Result<T, Canceled>;
15 15
16impl std::fmt::Display for Canceled { 16impl std::fmt::Display for Canceled {
17 fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { 17 fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
18 fmt.write_str("Canceled") 18 fmt.write_str("canceled")
19 } 19 }
20} 20}
21 21
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 1d6e3e5d6..afe0fec89 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -387,7 +387,7 @@ impl<'a> PoolDispatcher<'a> {
387 RawResponse::err( 387 RawResponse::err(
388 id, 388 id,
389 ErrorCode::ContentModified as i32, 389 ErrorCode::ContentModified as i32,
390 e.to_string(), 390 format!("content modified: {}", e),
391 ) 391 )
392 } else { 392 } else {
393 RawResponse::err( 393 RawResponse::err(