about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-08-14 01:59:14 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-08-14 01:59:14 +0300
commit0d29142aad9554a23f0881be95110ad96365bfcf (patch)
tree7236368088a78b6ea81ca6e39da8f4a1d7932766 /src
parent60960a260f7b5c695fd0717311d72ce62dd4eb43 (diff)
downloadrust-0d29142aad9554a23f0881be95110ad96365bfcf.tar.gz
rust-0d29142aad9554a23f0881be95110ad96365bfcf.zip
expand: `expand_fragment` -> `fully_expand_fragment`
Diffstat (limited to 'src')
-rw-r--r--src/libsyntax/ext/expand.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 9a3195b1165..21cf232ecc3 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -118,13 +118,13 @@ macro_rules! ast_fragments {
 
         impl<'a, 'b> MutVisitor for MacroExpander<'a, 'b> {
             fn filter_map_expr(&mut self, expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
-                self.expand_fragment(AstFragment::OptExpr(Some(expr))).make_opt_expr()
+                self.fully_expand_fragment(AstFragment::OptExpr(Some(expr))).make_opt_expr()
             }
             $($(fn $mut_visit_ast(&mut self, ast: &mut $AstTy) {
-                visit_clobber(ast, |ast| self.expand_fragment(AstFragment::$Kind(ast)).$make_ast());
+                visit_clobber(ast, |ast| self.fully_expand_fragment(AstFragment::$Kind(ast)).$make_ast());
             })?)*
             $($(fn $flat_map_ast_elt(&mut self, ast_elt: <$AstTy as IntoIterator>::Item) -> $AstTy {
-                self.expand_fragment(AstFragment::$Kind(smallvec![ast_elt])).$make_ast()
+                self.fully_expand_fragment(AstFragment::$Kind(smallvec![ast_elt])).$make_ast()
             })?)*
         }
 
@@ -265,7 +265,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
             tokens: None,
         })]);
 
-        match self.expand_fragment(krate_item).make_items().pop().map(P::into_inner) {
+        match self.fully_expand_fragment(krate_item).make_items().pop().map(P::into_inner) {
             Some(ast::Item { attrs, node: ast::ItemKind::Mod(module), .. }) => {
                 krate.attrs = attrs;
                 krate.module = module;
@@ -285,8 +285,8 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
         krate
     }
 
-    // Fully expand all macro invocations in this AST fragment.
-    fn expand_fragment(&mut self, input_fragment: AstFragment) -> AstFragment {
+    // Recursively expand all macro invocations in this AST fragment.
+    fn fully_expand_fragment(&mut self, input_fragment: AstFragment) -> AstFragment {
         let orig_expansion_data = self.cx.current_expansion.clone();
         self.cx.current_expansion.depth = 0;