More uniform naming

This commit is contained in:
Aleksey Kladov 2020-01-29 11:15:08 +01:00
parent 2d2585e03f
commit aaa4861a0b

View File

@ -452,7 +452,7 @@ fn on_request(
world: &mut WorldState,
pending_requests: &mut PendingRequests,
pool: &ThreadPool,
sender: &Sender<Task>,
task_sender: &Sender<Task>,
msg_sender: &Sender<Message>,
request_received: Instant,
req: Request,
@ -461,7 +461,7 @@ fn on_request(
req: Some(req),
pool,
world,
sender,
task_sender,
msg_sender,
pending_requests,
request_received,
@ -661,7 +661,7 @@ struct PoolDispatcher<'a> {
world: &'a mut WorldState,
pending_requests: &'a mut PendingRequests,
msg_sender: &'a Sender<Message>,
sender: &'a Sender<Task>,
task_sender: &'a Sender<Task>,
request_received: Instant,
}
@ -708,7 +708,7 @@ impl<'a> PoolDispatcher<'a> {
self.pool.execute({
let world = self.world.snapshot();
let sender = self.sender.clone();
let sender = self.task_sender.clone();
move || {
let result = f(world, params);
let task = result_to_task::<R>(id, result);
@ -786,7 +786,7 @@ fn update_file_notifications_on_threadpool(
pool: &ThreadPool,
world: WorldSnapshot,
publish_decorations: bool,
sender: Sender<Task>,
task_sender: Sender<Task>,
subscriptions: Vec<FileId>,
) {
log::trace!("updating notifications for {:?}", subscriptions);
@ -802,7 +802,7 @@ fn update_file_notifications_on_threadpool(
}
Ok(params) => {
let not = notification_new::<req::PublishDiagnostics>(params);
sender.send(Task::Notify(not)).unwrap();
task_sender.send(Task::Notify(not)).unwrap();
}
}
}
@ -815,7 +815,7 @@ fn update_file_notifications_on_threadpool(
}
Ok(params) => {
let not = notification_new::<req::PublishDecorations>(params);
sender.send(Task::Notify(not)).unwrap();
task_sender.send(Task::Notify(not)).unwrap();
}
}
}