mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move subs inside

Browse Source
This commit is contained in:
Aleksey Kladov 2019-06-01 10:24:43 +03:00
parent 5023860a55
commit 678a458543
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_lsp_server/src/main_loop.rs
View File

@ -78,7 +78,6 @@ pub fn main_loop(
let pool = ThreadPool::new(THREADPOOL_SIZE); let pool = ThreadPool::new(THREADPOOL_SIZE);
let (task_sender, task_receiver) = unbounded::<Task>(); let (task_sender, task_receiver) = unbounded::<Task>();
let mut pending_requests = PendingRequests::default(); let mut pending_requests = PendingRequests::default();
let mut subs = Subscriptions::default();
log::info!("server initialized, serving requests"); log::info!("server initialized, serving requests");
let main_res = main_loop_inner( let main_res = main_loop_inner(
@ -90,7 +89,6 @@ pub fn main_loop(
task_receiver.clone(), task_receiver.clone(),
&mut state, &mut state,
&mut pending_requests, &mut pending_requests,
&mut subs,
); );
log::info!("waiting for tasks to finish..."); log::info!("waiting for tasks to finish...");
@ -165,8 +163,8 @@ fn main_loop_inner(
task_receiver: Receiver<Task>, task_receiver: Receiver<Task>,
state: &mut ServerWorldState, state: &mut ServerWorldState,
pending_requests: &mut PendingRequests, pending_requests: &mut PendingRequests,
subs: &mut Subscriptions,
) -> Result<()> { ) -> Result<()> {
let mut subs = Subscriptions::default();
// We try not to index more than MAX_IN_FLIGHT_LIBS libraries at the same // We try not to index more than MAX_IN_FLIGHT_LIBS libraries at the same
// time to always have a thread ready to react to input. // time to always have a thread ready to react to input.
let mut in_flight_libraries = 0; let mut in_flight_libraries = 0;
@ -230,7 +228,7 @@ fn main_loop_inner(
)? )?
} }
RawMessage::Notification(not) => { RawMessage::Notification(not) => {
on_notification(msg_sender, state, pending_requests, subs, not)?; on_notification(msg_sender, state, pending_requests, &mut subs, not)?;
state_changed = true; state_changed = true;
} }
RawMessage::Response(resp) => log::error!("unexpected response: {:?}", resp), RawMessage::Response(resp) => log::error!("unexpected response: {:?}", resp),