Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-api/src/process.rs')
| -rw-r--r-- | crates/proc-macro-api/src/process.rs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/crates/proc-macro-api/src/process.rs b/crates/proc-macro-api/src/process.rs index c1b95fa7f1..2f5bef69ab 100644 --- a/crates/proc-macro-api/src/process.rs +++ b/crates/proc-macro-api/src/process.rs @@ -210,9 +210,8 @@ impl ProcMacroServerProcess { callback: Option<SubCallback<'_>>, ) -> Result<Result<Vec<(String, ProcMacroKind)>, String>, ServerError> { match self.protocol { - Protocol::LegacyJson { .. } | Protocol::LegacyPostcard { .. } => { - legacy_protocol::find_proc_macros(self, dylib_path) - } + Protocol::LegacyJson { .. } => legacy_protocol::find_proc_macros(self, dylib_path), + Protocol::BidirectionalPostcardPrototype { .. } => { let cb = callback.expect("callback required for bidirectional protocol"); bidirectional_protocol::find_proc_macros(self, dylib_path, cb) @@ -279,7 +278,7 @@ impl ProcMacroServerProcess { let result = match self.protocol { Protocol::LegacyJson { .. } => legacy_protocol::expand( proc_macro, - self, + self, subtree, attr, env, @@ -344,11 +343,7 @@ impl ProcMacroServerProcess { match state.process.exit_err() { None => e, Some(server_error) => { - proc_macro_worker - .get_exited() - .get_or_init(|| AssertUnwindSafe(server_error)) - .0 - .clone() + self.exited.get_or_init(|| AssertUnwindSafe(server_error)).0.clone() } } } else { |