aboutsummaryrefslogtreecommitdiff
path: root/crates/rust-analyzer/src/main_loop.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-06-25 08:01:14 +0100
committerGitHub <[email protected]>2020-06-25 08:01:14 +0100
commit44d525d4e02a8a4f2e21cde3377c4c0bd9269b41 (patch)
treef486439231cff1dcd0ef118bbbe72708d9113d75 /crates/rust-analyzer/src/main_loop.rs
parentfb70eb6e21da82c585d06e57c3c78f4aed4878f3 (diff)
parent5a184fe85517507fd3b07c6fb36b017e558665f7 (diff)
Merge #5048
5048: Unify code style for worker threads 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.rs6
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 03569086a..e5f82de5e 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -136,7 +136,7 @@ pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
136 Ok(task) => Event::Vfs(task), 136 Ok(task) => Event::Vfs(task),
137 Err(RecvError) => return Err("vfs died".into()), 137 Err(RecvError) => return Err("vfs died".into()),
138 }, 138 },
139 recv(global_state.flycheck.as_ref().map_or(&never(), |it| &it.task_recv)) -> task => match task { 139 recv(global_state.flycheck.as_ref().map_or(&never(), |it| &it.1)) -> task => match task {
140 Ok(task) => Event::CheckWatcher(task), 140 Ok(task) => Event::CheckWatcher(task),
141 Err(RecvError) => return Err("check watcher died".into()), 141 Err(RecvError) => return Err("check watcher died".into()),
142 }, 142 },
@@ -290,7 +290,7 @@ fn loop_turn(
290 290
291 if became_ready { 291 if became_ready {
292 if let Some(flycheck) = &global_state.flycheck { 292 if let Some(flycheck) = &global_state.flycheck {
293 flycheck.update(); 293 flycheck.0.update();
294 } 294 }
295 } 295 }
296 296
@@ -486,7 +486,7 @@ fn on_notification(
486 let not = match notification_cast::<lsp_types::notification::DidSaveTextDocument>(not) { 486 let not = match notification_cast::<lsp_types::notification::DidSaveTextDocument>(not) {
487 Ok(_params) => { 487 Ok(_params) => {
488 if let Some(flycheck) = &global_state.flycheck { 488 if let Some(flycheck) = &global_state.flycheck {
489 flycheck.update(); 489 flycheck.0.update();
490 } 490 }
491 return Ok(()); 491 return Ok(());
492 } 492 }