aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/mbe/src/expander.rs (renamed from crates/mbe/src/mbe_expander.rs)0
-rw-r--r--crates/mbe/src/expander/matcher.rs (renamed from crates/mbe/src/mbe_expander/matcher.rs)2
-rw-r--r--crates/mbe/src/expander/transcriber.rs (renamed from crates/mbe/src/mbe_expander/transcriber.rs)2
-rw-r--r--crates/mbe/src/lib.rs6
4 files changed, 5 insertions, 5 deletions
diff --git a/crates/mbe/src/mbe_expander.rs b/crates/mbe/src/expander.rs
index 802c8fb0f..802c8fb0f 100644
--- a/crates/mbe/src/mbe_expander.rs
+++ b/crates/mbe/src/expander.rs
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/expander/matcher.rs
index d32e60521..5b5845850 100644
--- a/crates/mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/expander/matcher.rs
@@ -1,7 +1,7 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use crate::{ 3use crate::{
4 mbe_expander::{Binding, Bindings, Fragment}, 4 expander::{Binding, Bindings, Fragment},
5 parser::{Op, RepeatKind, Separator}, 5 parser::{Op, RepeatKind, Separator},
6 subtree_source::SubtreeTokenSource, 6 subtree_source::SubtreeTokenSource,
7 tt_iter::TtIter, 7 tt_iter::TtIter,
diff --git a/crates/mbe/src/mbe_expander/transcriber.rs b/crates/mbe/src/expander/transcriber.rs
index 59a3c80a8..82bace110 100644
--- a/crates/mbe/src/mbe_expander/transcriber.rs
+++ b/crates/mbe/src/expander/transcriber.rs
@@ -5,7 +5,7 @@ use syntax::SmolStr;
5 5
6use super::ExpandResult; 6use super::ExpandResult;
7use crate::{ 7use crate::{
8 mbe_expander::{Binding, Bindings, Fragment}, 8 expander::{Binding, Bindings, Fragment},
9 parser::{Op, RepeatKind, Separator}, 9 parser::{Op, RepeatKind, Separator},
10 ExpandError, MetaTemplate, 10 ExpandError, MetaTemplate,
11}; 11};
diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs
index 35cde5f10..bbe71ce3e 100644
--- a/crates/mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
@@ -4,7 +4,7 @@
4//! `TokenTree`s as well! 4//! `TokenTree`s as well!
5 5
6mod parser; 6mod parser;
7mod mbe_expander; 7mod expander;
8mod syntax_bridge; 8mod syntax_bridge;
9mod tt_iter; 9mod tt_iter;
10mod subtree_source; 10mod subtree_source;
@@ -209,7 +209,7 @@ impl MacroRules {
209 // apply shift 209 // apply shift
210 let mut tt = tt.clone(); 210 let mut tt = tt.clone();
211 self.shift.shift_all(&mut tt); 211 self.shift.shift_all(&mut tt);
212 mbe_expander::expand_rules(&self.rules, &tt) 212 expander::expand_rules(&self.rules, &tt)
213 } 213 }
214 214
215 pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId { 215 pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId {
@@ -260,7 +260,7 @@ impl MacroDef {
260 // apply shift 260 // apply shift
261 let mut tt = tt.clone(); 261 let mut tt = tt.clone();
262 self.shift.shift_all(&mut tt); 262 self.shift.shift_all(&mut tt);
263 mbe_expander::expand_rules(&self.rules, &tt) 263 expander::expand_rules(&self.rules, &tt)
264 } 264 }
265 265
266 pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId { 266 pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId {