Rename mbe_expander for consistency
This commit is contained in:
parent
0ac4a8f354
commit
4c7d8cbfbf
@ -1,7 +1,7 @@
|
|||||||
//! FIXME: write short doc here
|
//! FIXME: write short doc here
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
mbe_expander::{Binding, Bindings, Fragment},
|
expander::{Binding, Bindings, Fragment},
|
||||||
parser::{Op, RepeatKind, Separator},
|
parser::{Op, RepeatKind, Separator},
|
||||||
subtree_source::SubtreeTokenSource,
|
subtree_source::SubtreeTokenSource,
|
||||||
tt_iter::TtIter,
|
tt_iter::TtIter,
|
@ -5,7 +5,7 @@ use syntax::SmolStr;
|
|||||||
|
|
||||||
use super::ExpandResult;
|
use super::ExpandResult;
|
||||||
use crate::{
|
use crate::{
|
||||||
mbe_expander::{Binding, Bindings, Fragment},
|
expander::{Binding, Bindings, Fragment},
|
||||||
parser::{Op, RepeatKind, Separator},
|
parser::{Op, RepeatKind, Separator},
|
||||||
ExpandError, MetaTemplate,
|
ExpandError, MetaTemplate,
|
||||||
};
|
};
|
@ -4,7 +4,7 @@
|
|||||||
//! `TokenTree`s as well!
|
//! `TokenTree`s as well!
|
||||||
|
|
||||||
mod parser;
|
mod parser;
|
||||||
mod mbe_expander;
|
mod expander;
|
||||||
mod syntax_bridge;
|
mod syntax_bridge;
|
||||||
mod tt_iter;
|
mod tt_iter;
|
||||||
mod subtree_source;
|
mod subtree_source;
|
||||||
@ -209,7 +209,7 @@ impl MacroRules {
|
|||||||
// apply shift
|
// apply shift
|
||||||
let mut tt = tt.clone();
|
let mut tt = tt.clone();
|
||||||
self.shift.shift_all(&mut tt);
|
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 {
|
pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId {
|
||||||
@ -260,7 +260,7 @@ impl MacroDef {
|
|||||||
// apply shift
|
// apply shift
|
||||||
let mut tt = tt.clone();
|
let mut tt = tt.clone();
|
||||||
self.shift.shift_all(&mut tt);
|
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 {
|
pub fn map_id_down(&self, id: tt::TokenId) -> tt::TokenId {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user