diff --git a/Cargo.lock b/Cargo.lock index b6367bf303f..b4872162212 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1022,6 +1022,7 @@ dependencies = [ name = "ra_macros" version = "0.1.0" dependencies = [ + "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/crates/ra_macros/Cargo.toml b/crates/ra_macros/Cargo.toml index 21c128442dc..7d3cb055c7e 100644 --- a/crates/ra_macros/Cargo.toml +++ b/crates/ra_macros/Cargo.toml @@ -5,5 +5,5 @@ version = "0.1.0" authors = ["Aleksey Kladov "] [dependencies] -rustc_hash = "1.0.0" +rustc-hash = "1.0.0" smol_str = "0.1.9" diff --git a/crates/ra_macros/src/mbe_expander.rs b/crates/ra_macros/src/mbe_expander.rs index 9436baa2837..545bd2002c0 100644 --- a/crates/ra_macros/src/mbe_expander.rs +++ b/crates/ra_macros/src/mbe_expander.rs @@ -8,7 +8,7 @@ pub fn exapnd(rules: &mbe::MacroRules, input: &tt::Subtree) -> Option Option { - let bidings = match_lhs(&rule.lhs, input)?; + let bindings = match_lhs(&rule.lhs, input)?; expand_rhs(&rule.rhs, &bindings) } @@ -17,10 +17,10 @@ struct Bindings { inner: FxHashMap, } -fn match_lhs(pattern: &mbe::TokenTree, input: &tt::Subtree) -> Option { +fn match_lhs(pattern: &mbe::Subtree, input: &tt::Subtree) -> Option { Some(Bindings::default()) } -fn expand_rhs(template: &mbe::TokenTree, bindings: &Bindings) -> Option { +fn expand_rhs(template: &mbe::Subtree, bindings: &Bindings) -> Option { None }