From 239213a3db61530c073d366b50c31b3a86aad879 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 9 Oct 2018 12:55:23 +0300 Subject: Prepare gen_lsp_server for publishing --- crates/ra_lsp_server/src/main.rs | 4 ++-- crates/ra_lsp_server/src/main_loop/mod.rs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'crates/ra_lsp_server') diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index c547764f6..e5d1792b7 100644 --- a/crates/ra_lsp_server/src/main.rs +++ b/crates/ra_lsp_server/src/main.rs @@ -35,14 +35,14 @@ fn main_inner() -> Result<()> { let cwd = ::std::env::current_dir()?; run_server( ra_lsp_server::server_capabilities(), + receiver, + sender, |params, r, s| { let root = params.root_uri .and_then(|it| it.to_file_path().ok()) .unwrap_or(cwd); ra_lsp_server::main_loop(false, root, r, s) }, - receiver, - sender, )?; info!("shutting down IO..."); threads.join()?; diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs index abc58b70e..47a9b202e 100644 --- a/crates/ra_lsp_server/src/main_loop/mod.rs +++ b/crates/ra_lsp_server/src/main_loop/mod.rs @@ -35,8 +35,8 @@ enum Task { pub fn main_loop( internal_mode: bool, root: PathBuf, - msg_receriver: &mut Receiver, - msg_sender: &mut Sender, + msg_receriver: &Receiver, + msg_sender: &Sender, ) -> Result<()> { let pool = rayon::ThreadPoolBuilder::new() .num_threads(4) @@ -88,8 +88,8 @@ fn main_loop_inner( internal_mode: bool, ws_root: PathBuf, pool: &ThreadPool, - msg_sender: &mut Sender, - msg_receiver: &mut Receiver, + msg_sender: &Sender, + msg_receiver: &Receiver, task_sender: Sender, task_receiver: Receiver, fs_worker: Worker)>, @@ -212,7 +212,7 @@ fn main_loop_inner( fn on_task( task: Task, - msg_sender: &mut Sender, + msg_sender: &Sender, pending_requests: &mut HashMap, ) { match task { @@ -266,7 +266,7 @@ fn on_request( } fn on_notification( - msg_sender: &mut Sender, + msg_sender: &Sender, state: &mut ServerWorldState, pending_requests: &mut HashMap, subs: &mut Subscriptions, -- cgit v1.2.3