fix tests (sort of)

Author: abonander

src/libsyntax/ext/expand.rs

@@ -541,6 +541,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
             // feature-gate the macro invocation
             if let Some((feature, issue)) = unstable_feature {
                 // only if the outer span doesn't allow unstable invocations
+                // TODO: compare crates of span and def_site_span (can't figure out how)
                 if !span.allows_unstable() && self_.cx.ecfg.features.map_or(true, |feats| {
                     // macro features will count as lib features
                     !feats.declared_lib_features.iter().any(|&(feat, _)| feat == feature)

src/test/compile-fail-fulldeps/auxiliary/macro-stability.rs renamed to src/test/compile-fail-fulldeps/auxiliary/unstable-macros.rs

@@ -9,7 +9,8 @@
 // except according to those terms.
 
 #![feature(staged_api)]
+#![stable(feature = "unit_test", since = "0.0.0")]
 
-#[unstable(feature = "unstable_macros", issue = 42069)]
+#[unstable(feature = "unstable_macros", issue = "42069")]
 #[macro_export]
 macro_rules! unstable_macro{ () => () }

src/test/compile-fail-fulldeps/macro-stability.rs

@@ -8,10 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:macro-stability.rs
+// aux-build:unstable-macros.rs
 
-#[macro_use] extern crate macros;
+#![feature(staged_api)]
+#[macro_use] extern crate unstable_macros;
+
+#[unstable(feature = "local_unstable", issue = "42069")]
+macro_rules! local_unstable { () => () }
 
 fn main() {
+    local_unstable!();
     unstable_macro!(); //~ ERROR: macro unstable_macro! is unstable
 }

src/test/run-pass-fulldeps/auxiliary/macro-stability.rs renamed to src/test/run-pass-fulldeps/auxiliary/unstable-macros.rs

@@ -9,7 +9,8 @@
 // except according to those terms.
 
 #![feature(staged_api)]
+#![stable(feature = "unit_test", since = "0.0.0")]
 
-#[unstable(feature = "unstable_macros", issue = 42069)]
+#[unstable(feature = "unstable_macros", issue = "42069")]
 #[macro_export]
 macro_rules! unstable_macro{ () => () }

src/test/run-pass-fulldeps/macro-stability.rs

@@ -8,12 +8,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:macro-stability.rs
+// aux-build:unstable-macros.rs
 
 #![feature(unstable_macros)]
 
-#[macro_use] extern crate macros;
+#[macro_use] extern crate unstable_macros;
+
+#[unstable(feature = "local_unstable", issue = "42069")]
+macro_rules! local_unstable { () => () }
 
 fn main() {
     unstable_macro!();
+    local_unstable!();
 }