aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-01-29 10:15:08 +0000
committerAleksey Kladov <[email protected]>2020-01-29 10:15:08 +0000
commitaaa4861a0b2f6cb2f9f271961d9836976e94b139 (patch)
treeb39dcd86a196e865ab32a0612e50a80d8af17c72
parent2d2585e03feeaa4a83d59a7ea2cdfbe948526840 (diff)
More uniform naming
-rw-r--r--crates/ra_lsp_server/src/main_loop.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
index 52c7e2bdb..2daaf1b4a 100644
--- a/crates/ra_lsp_server/src/main_loop.rs
+++ b/crates/ra_lsp_server/src/main_loop.rs
@@ -452,7 +452,7 @@ fn on_request(
452 world: &mut WorldState, 452 world: &mut WorldState,
453 pending_requests: &mut PendingRequests, 453 pending_requests: &mut PendingRequests,
454 pool: &ThreadPool, 454 pool: &ThreadPool,
455 sender: &Sender<Task>, 455 task_sender: &Sender<Task>,
456 msg_sender: &Sender<Message>, 456 msg_sender: &Sender<Message>,
457 request_received: Instant, 457 request_received: Instant,
458 req: Request, 458 req: Request,
@@ -461,7 +461,7 @@ fn on_request(
461 req: Some(req), 461 req: Some(req),
462 pool, 462 pool,
463 world, 463 world,
464 sender, 464 task_sender,
465 msg_sender, 465 msg_sender,
466 pending_requests, 466 pending_requests,
467 request_received, 467 request_received,
@@ -661,7 +661,7 @@ struct PoolDispatcher<'a> {
661 world: &'a mut WorldState, 661 world: &'a mut WorldState,
662 pending_requests: &'a mut PendingRequests, 662 pending_requests: &'a mut PendingRequests,
663 msg_sender: &'a Sender<Message>, 663 msg_sender: &'a Sender<Message>,
664 sender: &'a Sender<Task>, 664 task_sender: &'a Sender<Task>,
665 request_received: Instant, 665 request_received: Instant,
666} 666}
667 667
@@ -708,7 +708,7 @@ impl<'a> PoolDispatcher<'a> {
708 708
709 self.pool.execute({ 709 self.pool.execute({
710 let world = self.world.snapshot(); 710 let world = self.world.snapshot();
711 let sender = self.sender.clone(); 711 let sender = self.task_sender.clone();
712 move || { 712 move || {
713 let result = f(world, params); 713 let result = f(world, params);
714 let task = result_to_task::<R>(id, result); 714 let task = result_to_task::<R>(id, result);
@@ -786,7 +786,7 @@ fn update_file_notifications_on_threadpool(
786 pool: &ThreadPool, 786 pool: &ThreadPool,
787 world: WorldSnapshot, 787 world: WorldSnapshot,
788 publish_decorations: bool, 788 publish_decorations: bool,
789 sender: Sender<Task>, 789 task_sender: Sender<Task>,
790 subscriptions: Vec<FileId>, 790 subscriptions: Vec<FileId>,
791) { 791) {
792 log::trace!("updating notifications for {:?}", subscriptions); 792 log::trace!("updating notifications for {:?}", subscriptions);
@@ -802,7 +802,7 @@ fn update_file_notifications_on_threadpool(
802 } 802 }
803 Ok(params) => { 803 Ok(params) => {
804 let not = notification_new::<req::PublishDiagnostics>(params); 804 let not = notification_new::<req::PublishDiagnostics>(params);
805 sender.send(Task::Notify(not)).unwrap(); 805 task_sender.send(Task::Notify(not)).unwrap();
806 } 806 }
807 } 807 }
808 } 808 }
@@ -815,7 +815,7 @@ fn update_file_notifications_on_threadpool(
815 } 815 }
816 Ok(params) => { 816 Ok(params) => {
817 let not = notification_new::<req::PublishDecorations>(params); 817 let not = notification_new::<req::PublishDecorations>(params);
818 sender.send(Task::Notify(not)).unwrap(); 818 task_sender.send(Task::Notify(not)).unwrap();
819 } 819 }
820 } 820 }
821 } 821 }