diff options
author | gfreezy <[email protected]> | 2018-12-24 15:00:18 +0000 |
---|---|---|
committer | gfreezy <[email protected]> | 2018-12-24 15:00:18 +0000 |
commit | 29798c763cc121f7d610544deb940d70e4e33649 (patch) | |
tree | 4e492b0bf1c55acb0ca5079670a52739645674f8 /crates/ra_lsp_server/src | |
parent | 70df097c89ee45e4e0709c21b8aeee2e84e09fc4 (diff) |
remove option from Diagnostic
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 565ec92af..c0c414db0 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -13,7 +13,7 @@ use gen_lsp_server::{ | |||
13 | }; | 13 | }; |
14 | use languageserver_types::NumberOrString; | 14 | use languageserver_types::NumberOrString; |
15 | use ra_analysis::{Canceled, FileId, LibraryData}; | 15 | use ra_analysis::{Canceled, FileId, LibraryData}; |
16 | use ra_vfs::{VfsTask}; | 16 | use ra_vfs::VfsTask; |
17 | use rayon; | 17 | use rayon; |
18 | use threadpool::ThreadPool; | 18 | use threadpool::ThreadPool; |
19 | use rustc_hash::FxHashSet; | 19 | use rustc_hash::FxHashSet; |
@@ -23,7 +23,7 @@ use failure_derive::Fail; | |||
23 | 23 | ||
24 | use crate::{ | 24 | use crate::{ |
25 | main_loop::subscriptions::Subscriptions, | 25 | main_loop::subscriptions::Subscriptions, |
26 | project_model::{workspace_loader}, | 26 | project_model::workspace_loader, |
27 | req, | 27 | req, |
28 | server_world::{ServerWorld, ServerWorldState}, | 28 | server_world::{ServerWorld, ServerWorldState}, |
29 | Result, | 29 | Result, |
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 8e859e8d4..658d169cd 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -650,7 +650,7 @@ pub fn publish_diagnostics( | |||
650 | .into_iter() | 650 | .into_iter() |
651 | .map(|d| Diagnostic { | 651 | .map(|d| Diagnostic { |
652 | range: d.range.conv_with(&line_index), | 652 | range: d.range.conv_with(&line_index), |
653 | severity: d.severity.map(to_diagnostic_severity), | 653 | severity: Some(to_diagnostic_severity(d.severity)), |
654 | code: None, | 654 | code: None, |
655 | source: Some("rust-analyzer".to_string()), | 655 | source: Some("rust-analyzer".to_string()), |
656 | message: d.message, | 656 | message: d.message, |