mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring a bit

Browse Source
This commit is contained in:
Edwin Cheng 2020-03-26 10:49:23 +08:00
parent d0b6ed4441
commit 72e68d0caf
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ra_proc_macro/src/lib.rs
View File

@ -2,8 +2,8 @@
//!
//! We separate proc-macro expanding logic to an extern program to allow
//! different implementations (e.g. wasm or dylib loading). And this crate
//! is used for provide basic infra-structure for commnicate between two
//! process: Client (RA itself), Server (the external program)
//! is used to provide basic infrastructure for communication between two
//! processes: Client (RA itself), Server (the external program)
use ra_mbe::ExpandError;
use ra_tt::Subtree;
@ -18,7 +18,7 @@ trait ProcMacroExpander: std::fmt::Debug + Send + Sync + std::panic::RefUnwindSa
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct ProcMacroProcessExpander {
process_path: PathBuf,
process: Arc<ProcMacroProcessSrv>,
}
impl ProcMacroExpander for ProcMacroProcessExpander {
@ -34,7 +34,7 @@ fn custom_derive(
#[derive(Debug, Clone)]
pub struct ProcMacro {
expander: Arc<Box<dyn ProcMacroExpander>>,
expander: Arc<dyn ProcMacroExpander>,
name: String,
}
@ -55,16 +55,21 @@ pub fn custom_derive(&self, subtree: &Subtree) -> Result<Subtree, ExpandError> {
}
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct ProcMacroProcessSrv {
path: PathBuf,
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ProcMacroClient {
Process { expander: Arc<ProcMacroProcessExpander> },
Process { process: Arc<ProcMacroProcessSrv> },
Dummy,
}
impl ProcMacroClient {
pub fn extern_process(process_path: &Path) -> ProcMacroClient {
let expander = ProcMacroProcessExpander { process_path: process_path.into() };
ProcMacroClient::Process { expander: Arc::new(expander) }
let process = ProcMacroProcessSrv { path: process_path.into() };
ProcMacroClient::Process { process: Arc::new(process) }
}
pub fn dummy() -> ProcMacroClient {