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

remove repititive error block in callbacks

Browse source
This commit is contained in:
bit-aloo 2026-01-10 03:03:36 +05:30
parent 489245903e
commit 8d2811a7c3
No known key found for this signature in database
1 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,19 +197,25 @@ impl<'a> ProcMacroClientHandle<'a> {
}
}
impl proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle<'_> {
fn handle_failure(failure: Result<bidirectional::SubResponse, ProcMacroClientError>) -> ! {
match failure {
Err(ProcMacroClientError::Cancelled { reason }) => {
panic_any(ProcMacroCancelMarker { reason });
}
Err(err) => {
panic!("proc-macro IPC failed: {err:?}");
}
Ok(other) => {
panic!("unexpected SubResponse {other:?}");
}
}
}
impl<C: Codec> proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle<'_, C> {
fn file(&mut self, file_id: proc_macro_srv::span::FileId) -> String {
match self.roundtrip(bidirectional::SubRequest::FilePath { file_id: file_id.index() }) {
Ok(bidirectional::SubResponse::FilePathResult { name }) => name,
Err(ProcMacroClientError::Cancelled { reason }) => {
panic_any(ProcMacroCancelMarker { reason });
}
Err(err) => {
panic!("proc-macro IPC failed: {err:?}");
}
Ok(other) => {
panic!("unexpected SubResponse in file(): {other:?}");
}
other => handle_failure(other),
}
}
@ -224,15 +230,7 @@ impl proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle<'_> {
end: range.end().into(),
}) {
Ok(bidirectional::SubResponse::SourceTextResult { text }) => text,
Err(ProcMacroClientError::Cancelled { reason }) => {
panic_any(ProcMacroCancelMarker { reason });
}
Err(err) => {
panic!("proc-macro IPC failed: {err:?}");
}
Ok(other) => {
panic!("unexpected SubResponse in source_text: {other:?}");
}
other => handle_failure(other),
}
}
@ -240,15 +238,7 @@ impl proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle<'_> {
match self.roundtrip(bidirectional::SubRequest::LocalFilePath { file_id: file_id.index() })
{
Ok(bidirectional::SubResponse::LocalFilePathResult { name }) => name,
Err(ProcMacroClientError::Cancelled { reason }) => {
panic_any(ProcMacroCancelMarker { reason });
}
Err(err) => {
panic!("proc-macro IPC failed: {err:?}");
}
Ok(other) => {
panic!("unexpected SubResponse in local_file(): {other:?}");
}
other => handle_failure(other),
}
}
@ -262,15 +252,7 @@ impl proc_macro_srv::ProcMacroClientInterface for ProcMacroClientHandle<'_> {
Ok(bidirectional::SubResponse::LineColumnResult { line, column }) => {
Some((line, column))
}
Err(ProcMacroClientError::Cancelled { reason }) => {
panic_any(ProcMacroCancelMarker { reason });
}
Err(err) => {
panic!("proc-macro IPC failed: {err:?}");
}
Ok(other) => {
panic!("unexpected SubResponse in local_file(): {other:?}");
}
other => handle_failure(other),
}
}