Arc proc-macro expander paths

Smart-Squid-IDE · Jun 30, 2024 · 956c852 · 956c852
1 parent c236190
commit 956c852
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/crates/proc-macro-api/src/json.rs b/crates/proc-macro-api/src/json.rs
@@ -1,3 +1,4 @@
+//! Protocol functions for json.
 use std::io::{self, BufRead, Write};
 
 pub fn read_json<'a>(

diff --git a/crates/proc-macro-api/src/lib.rs b/crates/proc-macro-api/src/lib.rs
@@ -65,7 +65,7 @@ impl MacroDylib {
 #[derive(Debug, Clone)]
 pub struct ProcMacro {
     process: Arc<ProcMacroProcessSrv>,
-    dylib_path: AbsPathBuf,
+    dylib_path: Arc<AbsPathBuf>,
     name: SmolStr,
     kind: ProcMacroKind,
 }
@@ -75,7 +75,7 @@ impl PartialEq for ProcMacro {
     fn eq(&self, other: &Self) -> bool {
         self.name == other.name
             && self.kind == other.kind
-            && self.dylib_path == other.dylib_path
+            && Arc::ptr_eq(&self.dylib_path, &other.dylib_path)
             && Arc::ptr_eq(&self.process, &other.process)
     }
 }
@@ -116,14 +116,15 @@ impl ProcMacroServer {
         let _p = tracing::info_span!("ProcMacroServer::load_dylib").entered();
         let macros = self.process.find_proc_macros(&dylib.path)?;
 
+        let dylib_path = Arc::new(dylib.path);
         match macros {
             Ok(macros) => Ok(macros
                 .into_iter()
                 .map(|(name, kind)| ProcMacro {
                     process: self.process.clone(),
                     name: name.into(),
                     kind,
-                    dylib_path: dylib.path.clone(),
+                    dylib_path: dylib_path.clone(),
                 })
                 .collect()),
             Err(message) => Err(ServerError { message, io: None }),