mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
Aleksey Kladov 2020-06-26 11:21:21 +02:00
parent 3f2a596b9b
commit 1272e6cb88
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/rust-analyzer/src/global_state.rs
View File

@ -3,7 +3,7 @@
//!
//! Each tick provides an immutable snapshot of the state as `WorldSnapshot`.
use std::sync::Arc;
use std::{sync::Arc, time::Instant};
use crossbeam_channel::{unbounded, Receiver, Sender};
use flycheck::FlycheckHandle;
@ -20,7 +20,7 @@
diagnostics::{CheckFixes, DiagnosticCollection},
from_proto,
line_endings::LineEndings,
main_loop::{ReqQueue, Task},
main_loop::Task,
reload::SourceRootConfig,
request_metrics::{LatestRequests, RequestMetrics},
show_message,
@ -48,6 +48,9 @@ pub(crate) struct Handle<H, C> {
pub(crate) receiver: C,
}
pub(crate) type ReqHandler = fn(&mut GlobalState, lsp_server::Response);
pub(crate) type ReqQueue = lsp_server::ReqQueue<(String, Instant), ReqHandler>;
/// `GlobalState` is the primary mutable state of the language server
///
/// The most interesting components are `vfs`, which stores a consistent

6
crates/rust-analyzer/src/main_loop.rs
View File

@ -468,10 +468,6 @@ fn update_file_notifications_on_threadpool(&mut self, subscriptions: Vec<FileId>
}
}
pub(crate) type ReqHandler = fn(&mut GlobalState, Response);
pub(crate) type ReqQueue = lsp_server::ReqQueue<(String, Instant), ReqHandler>;
const DO_NOTHING: ReqHandler = |_, _| ();
#[derive(Eq, PartialEq)]
enum Progress {
Begin,
@ -499,7 +495,7 @@ fn report_progress(
let work_done_progress_create = global_state.req_queue.outgoing.register(
lsp_types::request::WorkDoneProgressCreate::METHOD.to_string(),
lsp_types::WorkDoneProgressCreateParams { token: token.clone() },
DO_NOTHING,
|_, _| (),
);
global_state.send(work_done_progress_create.into());