From 8be8cf854017e3b41324158868e9097fa6cdcc4d Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Sun, 28 Aug 2016 03:11:33 +0000 Subject: Refactor away `expand_item`. --- src/libsyntax/ext/expand.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 66a766a666b..687c5e2fdfb 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -345,10 +345,6 @@ fn expand_bang_invoc(invoc: Invocation, fld: &mut MacroExpander) -> Expansion { fully_expanded } -pub fn expand_item(it: P, fld: &mut MacroExpander) -> SmallVector> { - expand_annotatable(Annotatable::Item(it), fld).make_items() -} - // does this attribute list contain "macro_use" ? fn contains_macro_use(fld: &mut MacroExpander, attrs: &[ast::Attribute]) -> bool { for attr in attrs { @@ -649,7 +645,7 @@ impl<'a, 'b> Folder for MacroExpander<'a, 'b> { ::attr::first_attr_value_str_by_name(&item.attrs, "path") .unwrap_or(item.ident.name.as_str()) }); - result = expand_item(item, self); + result = expand_annotatable(Annotatable::Item(item), self).make_items(); self.cx.directory = directory; } else { let mut directory = match inner { @@ -658,11 +654,11 @@ impl<'a, 'b> Folder for MacroExpander<'a, 'b> { }; directory.pop(); let directory = replace(&mut self.cx.directory, directory); - result = expand_item(item, self); + result = expand_annotatable(Annotatable::Item(item), self).make_items(); self.cx.directory = directory; } } else { - result = expand_item(item, self); + result = expand_annotatable(Annotatable::Item(item), self).make_items(); } result } -- cgit 1.4.1-3-g733a5