From 326ffcefe09906560a03d3184a2ce76841448702 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 8 Sep 2018 12:36:02 +0300 Subject: Deal with deadlocks in a more principaled way --- crates/server/src/main_loop/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/server/src/main_loop') diff --git a/crates/server/src/main_loop/mod.rs b/crates/server/src/main_loop/mod.rs index 2ef1e2d17..b7f5efbb1 100644 --- a/crates/server/src/main_loop/mod.rs +++ b/crates/server/src/main_loop/mod.rs @@ -43,8 +43,8 @@ pub fn main_loop( .build() .unwrap(); let (task_sender, task_receiver) = unbounded::(); - let (fs_sender, fs_receiver, fs_watcher) = vfs::roots_loader(); - let (ws_sender, ws_receiver, ws_watcher) = workspace_loader(); + let ((fs_sender, fs_receiver), fs_watcher) = vfs::roots_loader(); + let ((ws_sender, ws_receiver), ws_watcher) = workspace_loader(); info!("server initialized, serving requests"); let mut state = ServerWorldState::new(); -- cgit v1.2.3