From b937262c9b75a361b95a6a27260a71c737e035bf Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 21 Aug 2018 18:30:10 +0300 Subject: Module map implementation --- crates/server/src/main_loop/mod.rs | 6 +++--- crates/server/src/server_world.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/server/src') diff --git a/crates/server/src/main_loop/mod.rs b/crates/server/src/main_loop/mod.rs index ad7c480dc..12a903dac 100644 --- a/crates/server/src/main_loop/mod.rs +++ b/crates/server/src/main_loop/mod.rs @@ -94,7 +94,7 @@ pub(super) fn main_loop( Event::Msg(msg) => { match msg { RawMsg::Request(req) => { - if !on_request(io, &state, pool, &task_sender, req)? { + if !on_request(io, &mut state, pool, &task_sender, req)? { return Ok(()); } } @@ -114,7 +114,7 @@ pub(super) fn main_loop( fn on_request( io: &mut Io, - world: &ServerWorldState, + world: &mut ServerWorldState, pool: &ThreadPool, sender: &Sender, req: RawRequest, @@ -252,7 +252,7 @@ fn on_notification( fn handle_request_on_threadpool( req: &mut Option, pool: &ThreadPool, - world: &ServerWorldState, + world: &mut ServerWorldState, sender: &Sender, f: fn(ServerWorld, R::Params) -> Result, ) -> Result<()> diff --git a/crates/server/src/server_world.rs b/crates/server/src/server_world.rs index c0d2efb86..9850822cd 100644 --- a/crates/server/src/server_world.rs +++ b/crates/server/src/server_world.rs @@ -86,7 +86,7 @@ impl ServerWorldState { Ok(()) } - pub fn snapshot(&self) -> ServerWorld { + pub fn snapshot(&mut self) -> ServerWorld { let pm = self.path_map.clone(); ServerWorld { analysis: self.analysis.snapshot(move |id, path| { -- cgit v1.2.3