Revert "Remove unneeded send method"

mo8it · mo8it · commit 7cce80c1738e · 2024-08-12T10:42:35.000+02:00
This reverts commit 567bde6.
diff --git a/crates/rust-analyzer/src/flycheck.rs b/crates/rust-analyzer/src/flycheck.rs
@@ -256,7 +256,7 @@ impl FlycheckActor {
     }
 
     fn report_progress(&self, progress: Progress) {
-        self.sender.send(FlycheckMessage::Progress { id: self.id, progress }).unwrap();
+        self.send(FlycheckMessage::Progress { id: self.id, progress });
     }
 
     fn next_event(&self, inbox: &Receiver<StateChange>) -> Option<Event> {
@@ -329,9 +329,7 @@ impl FlycheckActor {
                         );
                     }
                     if self.status == FlycheckStatus::Started {
-                        self.sender
-                            .send(FlycheckMessage::ClearDiagnostics { id: self.id })
-                            .unwrap();
+                        self.send(FlycheckMessage::ClearDiagnostics { id: self.id });
                     }
                     self.report_progress(Progress::DidFinish(res));
                     self.status = FlycheckStatus::Finished;
@@ -353,17 +351,13 @@ impl FlycheckActor {
                             "diagnostic received"
                         );
                         if self.status == FlycheckStatus::Started {
-                            self.sender
-                                .send(FlycheckMessage::ClearDiagnostics { id: self.id })
-                                .unwrap();
+                            self.send(FlycheckMessage::ClearDiagnostics { id: self.id });
                         }
-                        self.sender
-                            .send(FlycheckMessage::AddDiagnostic {
-                                id: self.id,
-                                workspace_root: self.root.clone(),
-                                diagnostic: msg,
-                            })
-                            .unwrap();
+                        self.send(FlycheckMessage::AddDiagnostic {
+                            id: self.id,
+                            workspace_root: self.root.clone(),
+                            diagnostic: msg,
+                        });
                         self.status = FlycheckStatus::DiagnosticSent;
                     }
                 },
@@ -483,6 +477,10 @@ impl FlycheckActor {
         cmd.args(args);
         Some(cmd)
     }
+
+    fn send(&self, check_task: FlycheckMessage) {
+        self.sender.send(check_task).unwrap();
+    }
 }
 
 #[allow(clippy::large_enum_variant)]
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs
@@ -504,7 +504,7 @@ impl GlobalState {
         handler: ReqHandler,
     ) {
         let request = self.req_queue.outgoing.register(R::METHOD.to_owned(), params, handler);
-        self.sender.send(request.into()).unwrap();
+        self.send(request.into());
     }
 
     pub(crate) fn complete_request(&mut self, response: lsp_server::Response) {
@@ -521,7 +521,7 @@ impl GlobalState {
         params: N::Params,
     ) {
         let not = lsp_server::Notification::new(N::METHOD.to_owned(), params);
-        self.sender.send(not.into()).unwrap();
+        self.send(not.into());
     }
 
     pub(crate) fn register_request(
@@ -544,20 +544,24 @@ impl GlobalState {
 
             let duration = start.elapsed();
             tracing::debug!("handled {} - ({}) in {:0.2?}", method, response.id, duration);
-            self.sender.send(response.into()).unwrap();
+            self.send(response.into());
         }
     }
 
     pub(crate) fn cancel(&mut self, request_id: lsp_server::RequestId) {
         if let Some(response) = self.req_queue.incoming.cancel(request_id) {
-            self.sender.send(response.into()).unwrap();
+            self.send(response.into());
         }
     }
 
     pub(crate) fn is_completed(&self, request: &lsp_server::Request) -> bool {
         self.req_queue.incoming.is_completed(&request.id)
     }
 
+    fn send(&self, message: lsp_server::Message) {
+        self.sender.send(message).unwrap()
+    }
+
     pub(crate) fn publish_diagnostics(
         &mut self,
         uri: Url,
diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs
@@ -186,19 +186,17 @@ impl NotifyActor {
                             }
                         }
 
-                        self.sender
-                            .send(loader::Message::Progress {
-                                n_total,
-                                n_done: LoadingProgress::Finished,
-                                config_version,
-                                dir: None,
-                            })
-                            .unwrap();
+                        self.send(loader::Message::Progress {
+                            n_total,
+                            n_done: LoadingProgress::Finished,
+                            config_version,
+                            dir: None,
+                        });
                     }
                     Message::Invalidate(path) => {
                         let contents = read(path.as_path());
                         let files = vec![(path, contents)];
-                        self.sender.send(loader::Message::Changed { files }).unwrap();
+                        self.send(loader::Message::Changed { files });
                     }
                 },
                 Event::NotifyEvent(event) => {
@@ -246,7 +244,7 @@ impl NotifyActor {
                                     Some((path, contents))
                                 })
                                 .collect();
-                            self.sender.send(loader::Message::Changed { files }).unwrap();
+                            self.send(loader::Message::Changed { files });
                         }
                     }
                 }
@@ -330,6 +328,10 @@ impl NotifyActor {
             log_notify_error(watcher.watch(path, RecursiveMode::NonRecursive));
         }
     }
+
+    fn send(&self, msg: loader::Message) {
+        self.sender.send(msg).unwrap();
+    }
 }
 
 fn read(path: &AbsPath) -> Option<Vec<u8>> {

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ impl GlobalState {`
`504`	`504`	`handler: ReqHandler,`
`505`	`505`	`) {`
`506`	`506`	`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());`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`pub(crate) fn complete_request(&mut self, response: lsp_server::Response) {`
`@@ -521,7 +521,7 @@ impl GlobalState {`
`521`	`521`	`params: N::Params,`
`522`	`522`	`) {`
`523`	`523`	`let not = lsp_server::Notification::new(N::METHOD.to_owned(), params);`
`524`		`- self.sender.send(not.into()).unwrap();`
	`524`	`+ self.send(not.into());`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`pub(crate) fn register_request(`
`@@ -544,20 +544,24 @@ impl GlobalState {`
`544`	`544`
`545`	`545`	`let duration = start.elapsed();`
`546`	`546`	`tracing::debug!("handled {} - ({}) in {:0.2?}", method, response.id, duration);`
`547`		`- self.sender.send(response.into()).unwrap();`
	`547`	`+ self.send(response.into());`
`548`	`548`	`}`
`549`	`549`	`}`
`550`	`550`
`551`	`551`	`pub(crate) fn cancel(&mut self, request_id: lsp_server::RequestId) {`
`552`	`552`	`if let Some(response) = self.req_queue.incoming.cancel(request_id) {`
`553`		`- self.sender.send(response.into()).unwrap();`
	`553`	`+ self.send(response.into());`
`554`	`554`	`}`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`pub(crate) fn is_completed(&self, request: &lsp_server::Request) -> bool {`
`558`	`558`	`self.req_queue.incoming.is_completed(&request.id)`
`559`	`559`	`}`
`560`	`560`
	`561`	`+ fn send(&self, message: lsp_server::Message) {`
	`562`	`+ self.sender.send(message).unwrap()`
	`563`	`+ }`
	`564`	`+`
`561`	`565`	`pub(crate) fn publish_diagnostics(`
`562`	`566`	`&mut self,`
`563`	`567`	`uri: Url,`
Original file line number	Diff line number	Diff line change
`@@ -186,19 +186,17 @@ impl NotifyActor {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`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`	`+ });`
`197`	`195`	`}`
`198`	`196`	`Message::Invalidate(path) => {`
`199`	`197`	`let contents = read(path.as_path());`
`200`	`198`	`let files = vec![(path, contents)];`
`201`		`- self.sender.send(loader::Message::Changed { files }).unwrap();`
	`199`	`+ self.send(loader::Message::Changed { files });`
`202`	`200`	`}`
`203`	`201`	`},`
`204`	`202`	`Event::NotifyEvent(event) => {`
`@@ -246,7 +244,7 @@ impl NotifyActor {`
`246`	`244`	`Some((path, contents))`
`247`	`245`	`})`
`248`	`246`	`.collect();`
`249`		`- self.sender.send(loader::Message::Changed { files }).unwrap();`
	`247`	`+ self.send(loader::Message::Changed { files });`
`250`	`248`	`}`
`251`	`249`	`}`
`252`	`250`	`}`
`@@ -330,6 +328,10 @@ impl NotifyActor {`
`330`	`328`	`log_notify_error(watcher.watch(path, RecursiveMode::NonRecursive));`
`331`	`329`	`}`
`332`	`330`	`}`
	`331`	`+`
	`332`	`+ fn send(&self, msg: loader::Message) {`
	`333`	`+ self.sender.send(msg).unwrap();`
	`334`	`+ }`
`333`	`335`	`}`
`334`	`336`
`335`	`337`	`fn read(path: &AbsPath) -> Option<Vec<u8>> {`