Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 06:28:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Aleksey Kladov
2020-06-26 11:43:07 +02:00
parent 34118779ec
commit 751b8792a2
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/rust-analyzer/src/global_state.rs
-8
View File
@@ -170,14 +170,6 @@ pub(crate) fn snapshot(&self) -> GlobalStateSnapshot {
}
}
pub(crate) fn maybe_collect_garbage(&mut self) {
self.analysis_host.maybe_collect_garbage()
}
pub(crate) fn collect_garbage(&mut self) {
self.analysis_host.collect_garbage()
}
pub(crate) fn send(&mut self, message: lsp_server::Message) {
self.sender.send(message).unwrap()
}
crates/rust-analyzer/src/main_loop.rs
+2 -2
View File
@@ -158,7 +158,7 @@ fn handle_event(&mut self, event: Event) -> Result<()> {
}
Task::Unit => (),
}
self.maybe_collect_garbage();
self.analysis_host.maybe_collect_garbage();
}
Event::Vfs(task) => match task {
vfs::loader::Message::Loaded { files } => {
@@ -274,7 +274,7 @@ fn on_request(&mut self, request_received: Instant, req: Request) -> Result<()>
self.req_queue.incoming.register(req.id.clone(), (req.method.clone(), request_received));
RequestDispatcher { req: Some(req), global_state: self }
.on_sync::<lsp_ext::CollectGarbage>(|s, ()| Ok(s.collect_garbage()))?
.on_sync::<lsp_ext::CollectGarbage>(|s, ()| Ok(s.analysis_host.collect_garbage()))?
.on_sync::<lsp_ext::JoinLines>(|s, p| handlers::handle_join_lines(s.snapshot(), p))?
.on_sync::<lsp_ext::OnEnter>(|s, p| handlers::handle_on_enter(s.snapshot(), p))?
.on_sync::<lsp_types::request::Shutdown>(|_, ()| Ok(()))?