diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-01 11:34:36 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-01 11:34:36 +0100 |
commit | ab284f30ce8a31e9c3d98f29b86bc8067d94376c (patch) | |
tree | 3b39875c5988d6c417ebbef3062376ecc3598e03 /crates/rust-analyzer/src/main_loop.rs | |
parent | e3a1f1c0011d5df53d995068a27527492c195b78 (diff) | |
parent | 65c89c3a200833099714e2943ead14184ae9c0df (diff) |
Merge #3803
3803: Cleanup 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 79dc03de4..06122ed95 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -21,7 +21,7 @@ use lsp_types::{ | |||
21 | WorkDoneProgressBegin, WorkDoneProgressCreateParams, WorkDoneProgressEnd, | 21 | WorkDoneProgressBegin, WorkDoneProgressCreateParams, WorkDoneProgressEnd, |
22 | WorkDoneProgressReport, | 22 | WorkDoneProgressReport, |
23 | }; | 23 | }; |
24 | use ra_flycheck::{url_from_path_with_drive_lowercasing, CheckConfig, CheckTask}; | 24 | use ra_flycheck::{url_from_path_with_drive_lowercasing, CheckTask, FlycheckConfig}; |
25 | use ra_ide::{Canceled, FileId, InlayHintsConfig, LibraryData, SourceRootId}; | 25 | use ra_ide::{Canceled, FileId, InlayHintsConfig, LibraryData, SourceRootId}; |
26 | use ra_prof::profile; | 26 | use ra_prof::profile; |
27 | use ra_vfs::{VfsFile, VfsTask, Watch}; | 27 | use ra_vfs::{VfsFile, VfsTask, Watch}; |
@@ -102,10 +102,10 @@ fn get_config( | |||
102 | max_length: config.inlay_hints_max_length, | 102 | max_length: config.inlay_hints_max_length, |
103 | }, | 103 | }, |
104 | check: if config.cargo_watch_enable { | 104 | check: if config.cargo_watch_enable { |
105 | Some(CheckConfig { | 105 | Some(FlycheckConfig { |
106 | args: config.cargo_watch_args.clone(), | ||
107 | command: config.cargo_watch_command.clone(), | 106 | command: config.cargo_watch_command.clone(), |
108 | all_targets: config.cargo_watch_all_targets, | 107 | all_targets: config.cargo_watch_all_targets, |
108 | extra_args: config.cargo_watch_args.clone(), | ||
109 | }) | 109 | }) |
110 | } else { | 110 | } else { |
111 | None | 111 | None |