Merge #4101

4101: Panic proc macro srv if read request failed r=matklad a=edwin0cheng

This PR fixed a bug when the rust-analyzer is killed suddenly, the `rust-analyzer proc-macro` will become stale.

Co-authored-by: Edwin Cheng <[email protected]>

1 files changed, 4 insertions, 11 deletions

diff --git a/crates/ra_proc_macro_srv/src/cli.rs b/crates/ra_proc_macro_srv/src/cli.rs
index 5f1f3ba3c..7282e5b9b 100644
--- a/crates/ra_proc_macro_srv/src/cli.rs
+++ b/crates/ra_proc_macro_srv/src/cli.rs
@@ -4,17 +4,8 @@ use crate::{expand_task, list_macros};
 use ra_proc_macro::msg::{self, Message};
 use std::io;
 
-pub fn run() {
-    loop {
-        let req = match read_request() {
-            Err(err) => {
-                eprintln!("Read message error on ra_proc_macro_srv: {}", err);
-                continue;
-            }
-            Ok(None) => continue,
-            Ok(Some(req)) => req,
-        };
-
+pub fn run() -> io::Result<()> {
+    while let Some(req) = read_request()? {
         let res = match req {
             msg::Request::ListMacro(task) => Ok(msg::Response::ListMacro(list_macros(&task))),
             msg::Request::ExpansionMacro(task) => {
@@ -33,6 +24,8 @@ pub fn run() {
             eprintln!("Write message error: {}", err);
         }
     }
+
+    Ok(())
 }
 
 fn read_request() -> io::Result<Option<msg::Request>> {