Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-srv/src/dylib/proc_macros.rs')
| -rw-r--r-- | crates/proc-macro-srv/src/dylib/proc_macros.rs | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/crates/proc-macro-srv/src/dylib/proc_macros.rs b/crates/proc-macro-srv/src/dylib/proc_macros.rs index 4ed32f8e6c..ef6752d816 100644 --- a/crates/proc-macro-srv/src/dylib/proc_macros.rs +++ b/crates/proc-macro-srv/src/dylib/proc_macros.rs @@ -5,7 +5,7 @@ use crate::{ use rustc_proc_macro::bridge; #[repr(transparent)] -pub(crate) struct ProcMacros([bridge::client::ProcMacro]); +pub(crate) struct ProcMacroClients([bridge::client::Client]); impl From<bridge::PanicMessage> for crate::PanicMessage { fn from(p: bridge::PanicMessage) -> Self { @@ -13,7 +13,16 @@ impl From<bridge::PanicMessage> for crate::PanicMessage { } } +pub(crate) struct ProcMacros(Vec<(bridge::client::Client, rustc_metadata::ProcMacroKind)>); + impl ProcMacros { + pub(super) fn new( + clients: &ProcMacroClients, + kinds: Vec<rustc_metadata::ProcMacroKind>, + ) -> Self { + ProcMacros(clients.0.iter().copied().zip(kinds).collect::<Vec<_>>()) + } + pub(crate) fn expand<'a, S: ProcMacroSrvSpan>( &self, macro_name: &str, @@ -27,12 +36,12 @@ impl ProcMacros { ) -> Result<TokenStream<S>, crate::PanicMessage> { let parsed_attributes = attribute.unwrap_or_default(); - for proc_macro in &self.0 { - match proc_macro { - bridge::client::ProcMacro::CustomDerive { trait_name, client, .. } - if *trait_name == macro_name => + for (client, kind) in &self.0 { + match kind { + rustc_metadata::ProcMacroKind::CustomDerive { trait_name, .. } + if trait_name.as_str() == macro_name => { - let res = client.run( + let res = client.run1( &bridge::server::SAME_THREAD, S::make_server(call_site, def_site, mixed_site, tracked_env, callback), macro_body, @@ -40,8 +49,8 @@ impl ProcMacros { ); return res.map_err(crate::PanicMessage::from); } - bridge::client::ProcMacro::Bang { name, client } if *name == macro_name => { - let res = client.run( + rustc_metadata::ProcMacroKind::Bang { name } if name.as_str() == macro_name => { + let res = client.run1( &bridge::server::SAME_THREAD, S::make_server(call_site, def_site, mixed_site, tracked_env, callback), macro_body, @@ -49,8 +58,8 @@ impl ProcMacros { ); return res.map_err(crate::PanicMessage::from); } - bridge::client::ProcMacro::Attr { name, client } if *name == macro_name => { - let res = client.run( + rustc_metadata::ProcMacroKind::Attr { name } if name.as_str() == macro_name => { + let res = client.run2( &bridge::server::SAME_THREAD, S::make_server(call_site, def_site, mixed_site, tracked_env, callback), parsed_attributes, @@ -67,12 +76,16 @@ impl ProcMacros { } pub(crate) fn list_macros(&self) -> impl Iterator<Item = (&str, ProcMacroKind)> { - self.0.iter().map(|proc_macro| match *proc_macro { - bridge::client::ProcMacro::CustomDerive { trait_name, .. } => { - (trait_name, ProcMacroKind::CustomDerive) + self.0.iter().map(|(_client, kind)| match kind { + rustc_metadata::ProcMacroKind::CustomDerive { trait_name, .. } => { + (trait_name.as_str(), ProcMacroKind::CustomDerive) + } + rustc_metadata::ProcMacroKind::Bang { name, .. } => { + (name.as_str(), ProcMacroKind::Bang) + } + rustc_metadata::ProcMacroKind::Attr { name, .. } => { + (name.as_str(), ProcMacroKind::Attr) } - bridge::client::ProcMacro::Bang { name, .. } => (name, ProcMacroKind::Bang), - bridge::client::ProcMacro::Attr { name, .. } => (name, ProcMacroKind::Attr), }) } } |