Remove deps on tt_mbe

2020-03-27 00:41:44 +08:00
parent 72e68d0caf
commit db162df264
10 changed files with 58 additions and 49 deletions
--- a/crates/ra_hir_expand/src/proc_macro.rs
+++ b/crates/ra_hir_expand/src/proc_macro.rs
@@ -23,9 +23,10 @@ impl ProcMacroExpander {
        let krate_graph = db.crate_graph();
        let proc_macro = krate_graph[self.krate]
            .proc_macro
-            .get(self.proc_macro_id.0)
+            .get(self.proc_macro_id.0 as usize)
            .clone()
            .ok_or_else(|| mbe::ExpandError::ConversionError)?;
-        proc_macro.custom_derive(tt)
+
+        proc_macro.expander.expand(&tt, None).map_err(mbe::ExpandError::from)
    }
 }