From 9970dd316b7e6b2d198dee7318c989fb312c6f5f Mon Sep 17 00:00:00 2001 From: veetaha Date: Sat, 9 May 2020 20:52:52 +0300 Subject: Simplify --- crates/rust-analyzer/src/main_loop.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crates') diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 17b0b95b9..a8fa2af08 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -173,7 +173,6 @@ pub fn main_loop(ws_roots: Vec, config: Config, connection: Connection) }; loop_state.roots_total = world_state.vfs.read().n_roots(); - loop_state.roots_scanned = 0; let pool = ThreadPool::default(); let (task_sender, task_receiver) = unbounded::(); @@ -400,10 +399,12 @@ fn loop_turn( } let max_in_flight_libs = pool.max_count().saturating_sub(2).max(1); - while loop_state.in_flight_libraries < max_in_flight_libs - && !loop_state.pending_libraries.is_empty() - { - let (root, files) = loop_state.pending_libraries.pop().unwrap(); + while loop_state.in_flight_libraries < max_in_flight_libs { + let (root, files) = match loop_state.pending_libraries.pop() { + Some(it) => it, + None => break, + }; + loop_state.in_flight_libraries += 1; let sender = libdata_sender.clone(); pool.execute(move || { -- cgit v1.2.3