diff options
| author | Aleksey Kladov <[email protected]> | 2018-09-08 10:36:02 +0100 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2018-09-08 10:36:02 +0100 |
| commit | 326ffcefe09906560a03d3184a2ce76841448702 (patch) | |
| tree | ca6c3b738122d87ed849c757087b3b5a3b7c2048 /crates/server/src/main_loop/mod.rs | |
| parent | d9ccebd913c767779e47f0c752e9f2f3dc35c080 (diff) | |
Deal with deadlocks in a more principaled way
Diffstat (limited to 'crates/server/src/main_loop/mod.rs')
| -rw-r--r-- | crates/server/src/main_loop/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
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( | |||
| 43 | .build() | 43 | .build() |
| 44 | .unwrap(); | 44 | .unwrap(); |
| 45 | let (task_sender, task_receiver) = unbounded::<Task>(); | 45 | let (task_sender, task_receiver) = unbounded::<Task>(); |
| 46 | let (fs_sender, fs_receiver, fs_watcher) = vfs::roots_loader(); | 46 | let ((fs_sender, fs_receiver), fs_watcher) = vfs::roots_loader(); |
| 47 | let (ws_sender, ws_receiver, ws_watcher) = workspace_loader(); | 47 | let ((ws_sender, ws_receiver), ws_watcher) = workspace_loader(); |
| 48 | 48 | ||
| 49 | info!("server initialized, serving requests"); | 49 | info!("server initialized, serving requests"); |
| 50 | let mut state = ServerWorldState::new(); | 50 | let mut state = ServerWorldState::new(); |