From 751b8792a2db3a744b22f5261d4136e671b14835 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 26 Jun 2020 11:43:07 +0200
Subject: [PATCH] Simplify
---
crates/rust-analyzer/src/global_state.rs | 8 --------
crates/rust-analyzer/src/main_loop.rs | 4 ++--
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
index 5b6c7922d9b..6a5ba138f03 100644
--- a/crates/rust-analyzer/src/global_state.rs
+++ b/crates/rust-analyzer/src/global_state.rs
@@ -170,14 +170,6 @@ impl GlobalState {
}
}
- 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()
}
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 386a47621b2..162c0057e98 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -158,7 +158,7 @@ impl GlobalState {
}
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 @@ impl GlobalState {
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(()))?