Address review comments and CI failures

Author: petrochenkov

src/librustc_resolve/macros.rs

@@ -186,7 +186,7 @@ impl<'a> base::Resolver for Resolver<'a> {
             Ok((def, ext)) => (def, ext),
             Err(Determinacy::Determined) if kind == MacroKind::Attr => {
                 // Replace unresolved attributes with used inert attributes for better recovery.
-                return Ok(Some(self.get_macro(Def::NonMacroAttr(NonMacroAttrKind::Tool))));
+                return Ok(Some(Lrc::new(SyntaxExtension::NonMacroAttr { mark_used: true })));
             }
             Err(determinacy) => return Err(determinacy),
         };

src/libsyntax/parse/parser.rs

@@ -2871,6 +2871,7 @@ impl<'a> Parser<'a> {
                 let mut err = self.fatal(&format!("unknown macro variable `{}`", name));
                 err.span_label(self.span, "unknown macro variable");
                 err.emit();
+                self.bump();
                 return
             }
             token::Interpolated(ref nt) => {

src/test/ui/panic-runtime/auxiliary/depends.rs renamed to src/test/compile-fail/auxiliary/depends.rs

@@ -2,7 +2,6 @@ macro_rules! e {
     ($inp:ident) => (
         $nonexistent
         //~^ ERROR unknown macro variable `nonexistent`
-        //~| ERROR cannot find value `nonexistent` in this scope
     );
 }
 

src/test/ui/panic-runtime/auxiliary/needs-panic-runtime.rs renamed to src/test/compile-fail/auxiliary/needs-panic-runtime.rs

@@ -7,15 +7,5 @@ LL |         $nonexistent
 LL |     e!(foo);
    |     -------- in this macro invocation
 
-error[E0425]: cannot find value `nonexistent` in this scope
-  --> $DIR/issue-6596-1.rs:14:9
-   |
-LL |         $nonexistent
-   |         ^^^^^^^^^^^^ not found in this scope
-...
-LL |     e!(foo);
-   |     -------- in this macro invocation
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0425`.

src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.rs renamed to src/test/compile-fail/runtime-depend-on-needs-runtime.rs

@@ -4,7 +4,6 @@ macro_rules! g {
     ($inp:ident) => (
         { $inp $nonexistent }
         //~^ ERROR unknown macro variable `nonexistent`
-        //~| ERROR expected one of
     );
 }
 

src/test/ui/panic-runtime/runtime-depend-on-needs-runtime.stderr renamed to src/test/compile-fail/runtime-depend-on-needs-runtime.stderr

@@ -7,14 +7,4 @@ LL |         { $inp $nonexistent }
 LL |     g!(foo);
    |     -------- in this macro invocation
 
-error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `nonexistent`
-  --> $DIR/issue-6596-2.rs:5:16
-   |
-LL |         { $inp $nonexistent }
-   |                ^^^^^^^^^^^^ expected one of 8 possible tokens here
-...
-LL |     g!(foo);
-   |     -------- in this macro invocation
-
-error: aborting due to 2 previous errors
-
+error: aborting due to previous error