Address code review

diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 975b91a1088a095ef94bb3c1bc6b60e9da1a6722..96003be31522cada4a025d1fc3f105774cae73eb 100644 (file)
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -1373,15 +1373,19 @@ fn fold_item(&mut self, item: P<ast::Item>) -> SmallVector<P<ast::Item>> {
                 result
             }
             // Ensure that test functions are accessible from the test harness.
+            // #[test] fn foo() {}
+            // becomes:
+            // #[test] pub fn foo_gensym(){}
+            // use foo_gensym as foo;
             ast::ItemKind::Fn(..) if self.cx.ecfg.should_test => {
                 if self.tests_nameable && item.attrs.iter().any(|attr| is_test_or_bench(attr)) {
-                    let orig_vis = item.vis.clone();
+                    let orig_ident = item.ident;
+                    let orig_vis   = item.vis.clone();
 
                     // Publicize the item under gensymed name to avoid pollution
                     item = item.map(|mut item| {
                         item.vis = respan(item.vis.span, ast::VisibilityKind::Public);
-                        item.ident = Ident::from_interned_str(
-                                                item.ident.as_interned_str()).gensym();
+                        item.ident = item.ident.gensym();
                         item
                     });
 
@@ -1389,8 +1393,9 @@ fn fold_item(&mut self, item: P<ast::Item>) -> SmallVector<P<ast::Item>> {
                     let use_item = self.cx.item_use_simple_(
                         item.ident.span,
                         orig_vis,
-                        Some(Ident::from_interned_str(item.ident.as_interned_str())),
-                        self.cx.path(item.ident.span, vec![Ident::from_str("self"), item.ident]));
+                        Some(orig_ident),
+                        self.cx.path(item.ident.span,
+                            vec![keywords::SelfValue.ident(), item.ident]));
 
                     SmallVector::many(
                         self.fold_unnameable(item).into_iter()