Rebase and fix nits

Author: djrenren

src/librustc_resolve/macros.rs

@@ -475,7 +475,7 @@ impl<'a, 'cl> Resolver<'a, 'cl> {
             return def;
         }
 
-        if *&path[0].as_str() == "test" {
+        if kind == MacroKind::Attr && *&path[0].as_str() == "test" {
             return Ok(self.macro_prelude.get(&path[0].name).unwrap().def())
         }
 

src/libsyntax/test.rs

@@ -121,17 +121,14 @@ impl<'a> fold::Folder for TestHarnessGenerator<'a> {
 
         let mut item = i.into_inner();
         if is_test_case(&item) {
-            debug!("this is a test function");
+            debug!("this is a test item");
 
             let test = Test {
                 span: item.span,
                 path: self.cx.path.clone(),
             };
             self.cx.test_cases.push(test);
             self.tests.push(item.ident);
-
-            // Ensure this item is capable of being reexported
-            item.vis = respan(item.vis.span, ast::VisibilityKind::Public);
         }
 
         // We don't want to recurse into anything other than mods, since

src/libsyntax_ext/Cargo.toml

@@ -16,4 +16,4 @@ syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_target = { path = "../librustc_target" }
-log = "0.4"
+log = "0.4"