diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-18 15:12:00 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-18 15:12:00 +0100 |
commit | 0e66dc690e16f29248f8d00ca0d68e58a34b52d8 (patch) | |
tree | b9ee153d4e66a670607e06c2ffb4cc579af49a16 /crates/rust-analyzer/src/main_loop.rs | |
parent | a3947129c5dc60cf051260c364833946f92e3350 (diff) | |
parent | 0866b1be894b9148cf69897a1e1aa70e3c416e29 (diff) |
Merge #5796
5796: Align diagnostics config with the rest of rust-analyzer
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 66e04653a..f039cdc31 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -248,7 +248,7 @@ impl GlobalState { | |||
248 | Event::Flycheck(task) => match task { | 248 | Event::Flycheck(task) => match task { |
249 | flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => { | 249 | flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => { |
250 | let diagnostics = crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp( | 250 | let diagnostics = crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp( |
251 | &self.config.diagnostics, | 251 | &self.config.diagnostics_map, |
252 | &diagnostic, | 252 | &diagnostic, |
253 | &workspace_root, | 253 | &workspace_root, |
254 | ); | 254 | ); |