diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-29 12:24:38 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-29 12:24:38 +0000 |
| commit | 3ecd5112bbc2cc1a45f423e0256230507f159162 (patch) | |
| tree | 012ff5ebc1cedb761dac87f5d05744603b1cc663 /crates/mbe/src/lib.rs | |
| parent | 0ac4a8f35497718a5d17f74e0dd3ef36227222cc (diff) | |
| parent | 4c7d8cbfbfd2d93008c1266eb45c2671bd49b60e (diff) | |
Merge #7488
7488: Rename mbe_expander for consistency r=edwin0cheng a=edwin0cheng
bors r+
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/mbe/src/lib.rs')
| -rw-r--r-- | crates/mbe/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||
| 6 | mod parser; | 6 | mod parser; |
| 7 | mod mbe_expander; | 7 | mod expander; |
| 8 | mod syntax_bridge; | 8 | mod syntax_bridge; |
| 9 | mod tt_iter; | 9 | mod tt_iter; |
| 10 | mod subtree_source; | 10 | mod 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 { |