Merge #308

308: tweak canceled message r=matklad a=matklad Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2018-12-21 08:09:36 +00:00 · 2018-12-21 08:09:36 +00:00 · f897de5b78
commit f897de5b78
parent f1fafeee02 b7d8bf1262
2 changed files with 2 additions and 2 deletions
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@ -15,7 +15,7 @@

 impl std::fmt::Display for Canceled {
    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        fmt.write_str("Canceled")
+        fmt.write_str("canceled")
    }
 }

--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@ -387,7 +387,7 @@ fn on<'b, R>(
                                    RawResponse::err(
                                        id,
                                        ErrorCode::ContentModified as i32,
-                                        e.to_string(),
+                                        format!("content modified: {}", e),
                                    )
                                } else {
                                    RawResponse::err(