@@ -118,13 +118,13 @@ macro_rules! ast_fragments {
118
118
119
119
impl <' a, ' b> MutVisitor for MacroExpander <' a, ' b> {
120
120
fn filter_map_expr( & mut self , expr: P <ast:: Expr >) -> Option <P <ast:: Expr >> {
121
- self . expand_fragment ( AstFragment :: OptExpr ( Some ( expr) ) ) . make_opt_expr( )
121
+ self . fully_expand_fragment ( AstFragment :: OptExpr ( Some ( expr) ) ) . make_opt_expr( )
122
122
}
123
123
$( $( fn $mut_visit_ast( & mut self , ast: & mut $AstTy) {
124
- visit_clobber( ast, |ast| self . expand_fragment ( AstFragment :: $Kind( ast) ) . $make_ast( ) ) ;
124
+ visit_clobber( ast, |ast| self . fully_expand_fragment ( AstFragment :: $Kind( ast) ) . $make_ast( ) ) ;
125
125
} ) ?) *
126
126
$( $( fn $flat_map_ast_elt( & mut self , ast_elt: <$AstTy as IntoIterator >:: Item ) -> $AstTy {
127
- self . expand_fragment ( AstFragment :: $Kind( smallvec![ ast_elt] ) ) . $make_ast( )
127
+ self . fully_expand_fragment ( AstFragment :: $Kind( smallvec![ ast_elt] ) ) . $make_ast( )
128
128
} ) ?) *
129
129
}
130
130
@@ -265,7 +265,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
265
265
tokens: None ,
266
266
} ) ] ) ;
267
267
268
- match self . expand_fragment ( krate_item) . make_items ( ) . pop ( ) . map ( P :: into_inner) {
268
+ match self . fully_expand_fragment ( krate_item) . make_items ( ) . pop ( ) . map ( P :: into_inner) {
269
269
Some ( ast:: Item { attrs, node : ast:: ItemKind :: Mod ( module) , .. } ) => {
270
270
krate. attrs = attrs;
271
271
krate. module = module;
@@ -285,8 +285,8 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
285
285
krate
286
286
}
287
287
288
- // Fully expand all macro invocations in this AST fragment.
289
- fn expand_fragment ( & mut self , input_fragment : AstFragment ) -> AstFragment {
288
+ // Recursively expand all macro invocations in this AST fragment.
289
+ fn fully_expand_fragment ( & mut self , input_fragment : AstFragment ) -> AstFragment {
290
290
let orig_expansion_data = self . cx . current_expansion . clone ( ) ;
291
291
self . cx . current_expansion . depth = 0 ;
292
292
0 commit comments