Skip to content

Commit 7cce80c

Browse files
committed
Revert "Remove unneeded send method"
This reverts commit 567bde6.
1 parent 2ece0fb commit 7cce80c

File tree

3 files changed

+32
-28
lines changed

3 files changed

+32
-28
lines changed

crates/rust-analyzer/src/flycheck.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl FlycheckActor {
256256
}
257257

258258
fn report_progress(&self, progress: Progress) {
259-
self.sender.send(FlycheckMessage::Progress { id: self.id, progress }).unwrap();
259+
self.send(FlycheckMessage::Progress { id: self.id, progress });
260260
}
261261

262262
fn next_event(&self, inbox: &Receiver<StateChange>) -> Option<Event> {
@@ -329,9 +329,7 @@ impl FlycheckActor {
329329
);
330330
}
331331
if self.status == FlycheckStatus::Started {
332-
self.sender
333-
.send(FlycheckMessage::ClearDiagnostics { id: self.id })
334-
.unwrap();
332+
self.send(FlycheckMessage::ClearDiagnostics { id: self.id });
335333
}
336334
self.report_progress(Progress::DidFinish(res));
337335
self.status = FlycheckStatus::Finished;
@@ -353,17 +351,13 @@ impl FlycheckActor {
353351
"diagnostic received"
354352
);
355353
if self.status == FlycheckStatus::Started {
356-
self.sender
357-
.send(FlycheckMessage::ClearDiagnostics { id: self.id })
358-
.unwrap();
354+
self.send(FlycheckMessage::ClearDiagnostics { id: self.id });
359355
}
360-
self.sender
361-
.send(FlycheckMessage::AddDiagnostic {
362-
id: self.id,
363-
workspace_root: self.root.clone(),
364-
diagnostic: msg,
365-
})
366-
.unwrap();
356+
self.send(FlycheckMessage::AddDiagnostic {
357+
id: self.id,
358+
workspace_root: self.root.clone(),
359+
diagnostic: msg,
360+
});
367361
self.status = FlycheckStatus::DiagnosticSent;
368362
}
369363
},
@@ -483,6 +477,10 @@ impl FlycheckActor {
483477
cmd.args(args);
484478
Some(cmd)
485479
}
480+
481+
fn send(&self, check_task: FlycheckMessage) {
482+
self.sender.send(check_task).unwrap();
483+
}
486484
}
487485

488486
#[allow(clippy::large_enum_variant)]

crates/rust-analyzer/src/global_state.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ impl GlobalState {
504504
handler: ReqHandler,
505505
) {
506506
let request = self.req_queue.outgoing.register(R::METHOD.to_owned(), params, handler);
507-
self.sender.send(request.into()).unwrap();
507+
self.send(request.into());
508508
}
509509

510510
pub(crate) fn complete_request(&mut self, response: lsp_server::Response) {
@@ -521,7 +521,7 @@ impl GlobalState {
521521
params: N::Params,
522522
) {
523523
let not = lsp_server::Notification::new(N::METHOD.to_owned(), params);
524-
self.sender.send(not.into()).unwrap();
524+
self.send(not.into());
525525
}
526526

527527
pub(crate) fn register_request(
@@ -544,20 +544,24 @@ impl GlobalState {
544544

545545
let duration = start.elapsed();
546546
tracing::debug!("handled {} - ({}) in {:0.2?}", method, response.id, duration);
547-
self.sender.send(response.into()).unwrap();
547+
self.send(response.into());
548548
}
549549
}
550550

551551
pub(crate) fn cancel(&mut self, request_id: lsp_server::RequestId) {
552552
if let Some(response) = self.req_queue.incoming.cancel(request_id) {
553-
self.sender.send(response.into()).unwrap();
553+
self.send(response.into());
554554
}
555555
}
556556

557557
pub(crate) fn is_completed(&self, request: &lsp_server::Request) -> bool {
558558
self.req_queue.incoming.is_completed(&request.id)
559559
}
560560

561+
fn send(&self, message: lsp_server::Message) {
562+
self.sender.send(message).unwrap()
563+
}
564+
561565
pub(crate) fn publish_diagnostics(
562566
&mut self,
563567
uri: Url,

crates/vfs-notify/src/lib.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -186,19 +186,17 @@ impl NotifyActor {
186186
}
187187
}
188188

189-
self.sender
190-
.send(loader::Message::Progress {
191-
n_total,
192-
n_done: LoadingProgress::Finished,
193-
config_version,
194-
dir: None,
195-
})
196-
.unwrap();
189+
self.send(loader::Message::Progress {
190+
n_total,
191+
n_done: LoadingProgress::Finished,
192+
config_version,
193+
dir: None,
194+
});
197195
}
198196
Message::Invalidate(path) => {
199197
let contents = read(path.as_path());
200198
let files = vec![(path, contents)];
201-
self.sender.send(loader::Message::Changed { files }).unwrap();
199+
self.send(loader::Message::Changed { files });
202200
}
203201
},
204202
Event::NotifyEvent(event) => {
@@ -246,7 +244,7 @@ impl NotifyActor {
246244
Some((path, contents))
247245
})
248246
.collect();
249-
self.sender.send(loader::Message::Changed { files }).unwrap();
247+
self.send(loader::Message::Changed { files });
250248
}
251249
}
252250
}
@@ -330,6 +328,10 @@ impl NotifyActor {
330328
log_notify_error(watcher.watch(path, RecursiveMode::NonRecursive));
331329
}
332330
}
331+
332+
fn send(&self, msg: loader::Message) {
333+
self.sender.send(msg).unwrap();
334+
}
333335
}
334336

335337
fn read(path: &AbsPath) -> Option<Vec<u8>> {

0 commit comments

Comments
 (0)