Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7488

Browse source 
7488: Rename mbe_expander for consistency r=edwin0cheng a=edwin0cheng

bors r+

Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
This commit is contained in:
bors[bot] 2021-01-29 12:24:38 +00:00 committed by GitHub
commit 3ecd5112bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
crates/mbe/src/mbe_expander.rs → crates/mbe/src/expander.rs
View file

2
crates/mbe/src/mbe_expander/matcher.rs → crates/mbe/src/expander/matcher.rs
View file

@ -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,

2
crates/mbe/src/mbe_expander/transcriber.rs → crates/mbe/src/expander/transcriber.rs
View file

@ -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,
};

6
crates/mbe/src/lib.rs
View file

@ -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 {