diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-25 08:15:30 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-25 08:15:30 +0100 |
commit | edf8f419b532b93102222b9deb2c8bb5080911d9 (patch) | |
tree | 824aec6d18f409cc46d28d36161dd06cae53cdaf /crates/rust-analyzer/src/main_loop.rs | |
parent | 44d525d4e02a8a4f2e21cde3377c4c0bd9269b41 (diff) | |
parent | 0ec5d4f55c6a5ac3fadcd48ae17b70379aba17fa (diff) |
Merge #5049
5049: Rename ra_flycheck -> flycheck 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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index e5f82de5e..0664e4a5a 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -9,10 +9,10 @@ use std::{ | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | use crossbeam_channel::{never, select, unbounded, RecvError, Sender}; | 11 | use crossbeam_channel::{never, select, unbounded, RecvError, Sender}; |
12 | use flycheck::CheckTask; | ||
12 | use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response}; | 13 | use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response}; |
13 | use lsp_types::{request::Request as _, NumberOrString, TextDocumentContentChangeEvent}; | 14 | use lsp_types::{request::Request as _, NumberOrString, TextDocumentContentChangeEvent}; |
14 | use ra_db::VfsPath; | 15 | use ra_db::VfsPath; |
15 | use ra_flycheck::CheckTask; | ||
16 | use ra_ide::{Canceled, FileId, LineIndex}; | 16 | use ra_ide::{Canceled, FileId, LineIndex}; |
17 | use ra_prof::profile; | 17 | use ra_prof::profile; |
18 | use ra_project_model::{PackageRoot, ProjectWorkspace}; | 18 | use ra_project_model::{PackageRoot, ProjectWorkspace}; |
@@ -629,9 +629,9 @@ fn on_check_task( | |||
629 | 629 | ||
630 | CheckTask::Status(status) => { | 630 | CheckTask::Status(status) => { |
631 | let (state, message) = match status { | 631 | let (state, message) = match status { |
632 | ra_flycheck::Status::Being => (ProgressState::Start, None), | 632 | flycheck::Status::Being => (ProgressState::Start, None), |
633 | ra_flycheck::Status::Progress(target) => (ProgressState::Report, Some(target)), | 633 | flycheck::Status::Progress(target) => (ProgressState::Report, Some(target)), |
634 | ra_flycheck::Status::End => (ProgressState::End, None), | 634 | flycheck::Status::End => (ProgressState::End, None), |
635 | }; | 635 | }; |
636 | 636 | ||
637 | report_progress(global_state, msg_sender, "cargo check", state, message, None); | 637 | report_progress(global_state, msg_sender, "cargo check", state, message, None); |