user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unwraps from source_text impl

Browse source
This commit is contained in:
bit-aloo 2025-12-27 17:52:16 +05:30
parent 7e873dbeb4
commit 43cda6d5ec
No known key found for this signature in database
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/tools/rust-analyzer/crates/proc-macro-srv-cli/src/main_loop.rs
View file

@ -169,21 +169,27 @@ struct ProcMacroClientHandle<'a, C: Codec> {
impl<C: Codec> proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle<'_, C> {
fn source_text(&mut self, file_id: u32, start: u32, end: u32) -> Option<String> {
let subrequest = bidirectional::SubRequest::SourceText { file_id, start, end };
bidirectional::BidirectionalMessage::SubRequest(subrequest)
.write::<_, C>(&mut self.stdout.lock())
.unwrap();
let resp =
bidirectional::BidirectionalMessage::read::<_, C>(&mut self.stdin.lock(), self.buf)
.unwrap()
.expect("client closed connection");
match resp {
bidirectional::BidirectionalMessage::SubResponse(api_resp) => match api_resp {
bidirectional::SubResponse::SourceTextResult { text } => {
return text;
}
},
other => panic!("expected SubResponse, got {other:?}"),
let req = bidirectional::BidirectionalMessage::SubRequest(
bidirectional::SubRequest::SourceText { file_id, start, end },
);
if req.write::<_, C>(&mut self.stdout.lock()).is_err() {
return None;
}
let msg = match bidirectional::BidirectionalMessage::read::<_, C>(
&mut self.stdin.lock(),
self.buf,
) {
Ok(Some(msg)) => msg,
_ => return None,
};
match msg {
bidirectional::BidirectionalMessage::SubResponse(
bidirectional::SubResponse::SourceTextResult { text },
) => text,
_ => None,
}
}
}