bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-srv/src/lib.rs')
-rw-r--r--crates/proc-macro-srv/src/lib.rs25
1 files changed, 17 insertions, 8 deletions
diff --git a/crates/proc-macro-srv/src/lib.rs b/crates/proc-macro-srv/src/lib.rs
index 0462aafd00..c548dc620a 100644
--- a/crates/proc-macro-srv/src/lib.rs
+++ b/crates/proc-macro-srv/src/lib.rs
@@ -105,8 +105,9 @@ pub enum ProcMacroClientError {
}
#[derive(Debug)]
-pub struct ProcMacroCancelMarker {
- pub reason: String,
+pub enum ProcMacroPanicMarker {
+ Cancelled { reason: String },
+ Internal { reason: String },
}
pub type ProcMacroClientHandle<'a> = &'a mut (dyn ProcMacroClientInterface + Sync + Send);
@@ -126,6 +127,7 @@ const EXPANDER_STACK_SIZE: usize = 8 * 1024 * 1024;
pub enum ExpandError {
Panic(PanicMessage),
Cancelled { reason: Option<String> },
+ Internal { reason: Option<String> },
}
impl ExpandError {
@@ -133,6 +135,7 @@ impl ExpandError {
match self {
ExpandError::Panic(panic_message) => panic_message.into_string(),
ExpandError::Cancelled { reason } => reason,
+ ExpandError::Internal { reason } => reason,
}
}
}
@@ -152,10 +155,8 @@ impl ProcMacroSrv<'_> {
callback: Option<ProcMacroClientHandle<'_>>,
) -> Result<token_stream::TokenStream<S>, ExpandError> {
let snapped_env = self.env;
- let expander = self.expander(lib.as_ref()).map_err(|err| {
- ExpandError::Panic(PanicMessage {
- message: Some(format!("failed to load macro: {err}")),
- })
+ let expander = self.expander(lib.as_ref()).map_err(|err| ExpandError::Internal {
+ reason: Some(format!("failed to load macro: {err}")),
})?;
let prev_env = EnvChange::apply(snapped_env, env, current_dir.as_ref().map(<_>::as_ref));
@@ -176,9 +177,17 @@ impl ProcMacroSrv<'_> {
Ok(res) => res.map_err(ExpandError::Panic),
Err(payload) => {
- if let Some(cancel) = payload.downcast_ref::<ProcMacroCancelMarker>() {
- return Err(ExpandError::Cancelled { reason: Some(cancel.reason.clone()) });
+ if let Some(marker) = payload.downcast_ref::<ProcMacroPanicMarker>() {
+ return match marker {
+ ProcMacroPanicMarker::Cancelled { reason } => {
+ Err(ExpandError::Cancelled { reason: Some(reason.clone()) })
+ }
+ ProcMacroPanicMarker::Internal { reason } => {
+ Err(ExpandError::Internal { reason: Some(reason.clone()) })
+ }
+ };
}
+
std::panic::resume_unwind(payload)
}
}