diff --git a/crates/mbe/src/mbe_expander.rs b/crates/mbe/src/expander.rs similarity index 100% rename from crates/mbe/src/mbe_expander.rs rename to crates/mbe/src/expander.rs diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/expander/matcher.rs similarity index 99% rename from crates/mbe/src/mbe_expander/matcher.rs rename to crates/mbe/src/expander/matcher.rs index d32e60521471..5b58458509fa 100644 --- a/crates/mbe/src/mbe_expander/matcher.rs +++ b/crates/mbe/src/expander/matcher.rs @@ -1,7 +1,7 @@ //! FIXME: write short doc here use crate::{ - mbe_expander::{Binding, Bindings, Fragment}, + expander::{Binding, Bindings, Fragment}, parser::{Op, RepeatKind, Separator}, subtree_source::SubtreeTokenSource, tt_iter::TtIter, diff --git a/crates/mbe/src/mbe_expander/transcriber.rs b/crates/mbe/src/expander/transcriber.rs similarity index 99% rename from crates/mbe/src/mbe_expander/transcriber.rs rename to crates/mbe/src/expander/transcriber.rs index 59a3c80a8b62..82bace110f44 100644 --- a/crates/mbe/src/mbe_expander/transcriber.rs +++ b/crates/mbe/src/expander/transcriber.rs @@ -5,7 +5,7 @@ use syntax::SmolStr; use super::ExpandResult; use crate::{ - mbe_expander::{Binding, Bindings, Fragment}, + expander::{Binding, Bindings, Fragment}, parser::{Op, RepeatKind, Separator}, ExpandError, MetaTemplate, }; diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs index 35cde5f10cc9..bbe71ce3e688 100644 --- a/crates/mbe/src/lib.rs +++ b/crates/mbe/src/lib.rs @@ -4,7 +4,7 @@ //! `TokenTree`s as well! mod parser; -mod mbe_expander; +mod expander; mod syntax_bridge; mod tt_iter; mod subtree_source; @@ -209,7 +209,7 @@ impl MacroRules { // apply shift let mut tt = tt.clone(); self.shift.shift_all(&mut tt); - mbe_expander::expand_rules(&self.rules, &tt) + expander::expand_rules(&self.rules, &tt) } pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId { @@ -260,7 +260,7 @@ impl MacroDef { // apply shift let mut tt = tt.clone(); self.shift.shift_all(&mut tt); - mbe_expander::expand_rules(&self.rules, &tt) + expander::expand_rules(&self.rules, &tt) } pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId {