bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs')
-rw-r--r--crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
index 1a8f6d6730..cccb74429d 100644
--- a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
+++ b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
@@ -163,12 +163,9 @@ impl server::Span for RaSpanServer {
start,
end,
});
- self.cli_to_server
- .clone()
- .unwrap()
- .recv()
- .and_then(|SubResponse::SourceTextResult { text }| Ok(text))
- .expect("REASON")
+ match self.cli_to_server.as_ref()?.recv().ok()? {
+ SubResponse::SourceTextResult { text } => text,
+ }
} else {
None
}