Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/proc-macro-api/src/bidirectional_protocol.rs')
| -rw-r--r-- | crates/proc-macro-api/src/bidirectional_protocol.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/proc-macro-api/src/bidirectional_protocol.rs b/crates/proc-macro-api/src/bidirectional_protocol.rs index 5996f88298..643ba98f51 100644 --- a/crates/proc-macro-api/src/bidirectional_protocol.rs +++ b/crates/proc-macro-api/src/bidirectional_protocol.rs @@ -21,7 +21,7 @@ use crate::{ serialize_span_data_index_map, }, }, - process::ProcMacroServerProcess, + process::{ProcMacroWorker, SynIO}, transport::codec::postcard::PostcardProtocol, version, }; @@ -84,7 +84,7 @@ fn wrap_decode(err: io::Error) -> ServerError { } pub(crate) fn version_check( - srv: &ProcMacroServerProcess, + srv: &dyn ProcMacroWorker, callback: SubCallback<'_>, ) -> Result<u32, ServerError> { let request = BidirectionalMessage::Request(Request::ApiVersionCheck {}); @@ -101,7 +101,7 @@ pub(crate) fn version_check( /// Enable support for rust-analyzer span mode if the server supports it. pub(crate) fn enable_rust_analyzer_spans( - srv: &ProcMacroServerProcess, + srv: &dyn ProcMacroWorker, callback: SubCallback<'_>, ) -> Result<SpanMode, ServerError> { let request = BidirectionalMessage::Request(Request::SetConfig(ServerConfig { @@ -120,7 +120,7 @@ pub(crate) fn enable_rust_analyzer_spans( /// Finds proc-macros in a given dynamic library. pub(crate) fn find_proc_macros( - srv: &ProcMacroServerProcess, + srv: &dyn ProcMacroWorker, dylib_path: &AbsPath, callback: SubCallback<'_>, ) -> Result<Result<Vec<(String, ProcMacroKind)>, String>, ServerError> { @@ -175,7 +175,7 @@ pub(crate) fn expand( current_dir: Some(current_dir), }))); - let response_payload = run_request(&proc_macro.process, task, callback)?; + let response_payload = run_request(proc_macro.process.as_ref(), task, callback)?; match response_payload { BidirectionalMessage::Response(Response::ExpandMacro(it)) => Ok(it @@ -205,7 +205,7 @@ pub(crate) fn expand( } fn run_request( - srv: &ProcMacroServerProcess, + srv: &dyn ProcMacroWorker, msg: BidirectionalMessage, callback: SubCallback<'_>, ) -> Result<BidirectionalMessage, ServerError> { |