Fix tests

Author: bjorn3

tests/ui/macros/same-sequence-span.stderr

@@ -17,8 +17,8 @@ LL |                $(= $z:tt)*
 error: `$x:expr` may be followed by `$y:tt`, which is not allowed for `expr` fragments
   --> $DIR/same-sequence-span.rs:19:1
    |
-LL | | macro_rules! manual_foo {
-   | |__________________________^not allowed after `expr` fragments
+LL | |
+   | |_^not allowed after `expr` fragments
 ...
 LL |   proc_macro_sequence::make_foo!();
    |   ^-------------------------------

tests/ui/proc-macro/auxiliary/custom-quote.rs

@@ -1,8 +1,6 @@
 #![feature(proc_macro_quote)]
-#![feature(proc_macro_internals)] // FIXME - this shouldn't be necessary
 
 extern crate proc_macro;
-extern crate custom_quote;
 
 use proc_macro::{quote, TokenStream};
 
@@ -19,13 +17,6 @@ pub fn error_from_bang(_input: TokenStream) -> TokenStream {
     expand_to_quote!()
 }
 
-#[proc_macro]
-pub fn other_error_from_bang(_input: TokenStream) -> TokenStream {
-    custom_quote::custom_quote! {
-        my_ident
-    }
-}
-
 #[proc_macro_attribute]
 pub fn error_from_attribute(_args: TokenStream, _input: TokenStream) -> TokenStream {
     quote! {

tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs

@@ -1,4 +1,3 @@
-//@ proc-macro: custom-quote.rs
 //@ proc-macro: span-from-proc-macro.rs
 //@ compile-flags: -Z macro-backtrace
 
@@ -13,5 +12,4 @@ struct Kept;
 
 fn main() {
     error_from_bang!(); //~ ERROR mismatched types
-    other_error_from_bang!(); //~ ERROR cannot find value `my_ident`
 }

tests/ui/proc-macro/span-from-proc-macro.rs

@@ -1,62 +1,47 @@
 error[E0412]: cannot find type `MissingType` in this scope
-  --> $DIR/auxiliary/span-from-proc-macro.rs:33:20
+  --> $DIR/auxiliary/span-from-proc-macro.rs:21:1
    |
 LL | pub fn error_from_attribute(_args: TokenStream, _input: TokenStream) -> TokenStream {
-   | ----------------------------------------------------------------------------------- in this expansion of `#[error_from_attribute]`
-...
-LL |             field: MissingType
-   |                    ^^^^^^^^^^^ not found in this scope
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | not found in this scope
+   | in this expansion of `#[error_from_attribute]`
    |
-  ::: $DIR/span-from-proc-macro.rs:8:1
+  ::: $DIR/span-from-proc-macro.rs:7:1
    |
 LL | #[error_from_attribute]
    | ----------------------- in this procedural macro expansion
 
 error[E0412]: cannot find type `OtherMissingType` in this scope
-  --> $DIR/auxiliary/span-from-proc-macro.rs:42:21
+  --> $DIR/auxiliary/span-from-proc-macro.rs:30:1
    |
 LL | pub fn error_from_derive(_input: TokenStream) -> TokenStream {
-   | ------------------------------------------------------------ in this expansion of `#[derive(ErrorFromDerive)]`
-...
-LL |             Variant(OtherMissingType)
-   |                     ^^^^^^^^^^^^^^^^ not found in this scope
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | not found in this scope
+   | in this expansion of `#[derive(ErrorFromDerive)]`
    |
-  ::: $DIR/span-from-proc-macro.rs:11:10
+  ::: $DIR/span-from-proc-macro.rs:10:10
    |
 LL | #[derive(ErrorFromDerive)]
    |          --------------- in this derive macro expansion
 
-error[E0425]: cannot find value `my_ident` in this scope
-  --> $DIR/auxiliary/span-from-proc-macro.rs:25:9
-   |
-LL | pub fn other_error_from_bang(_input: TokenStream) -> TokenStream {
-   | ---------------------------------------------------------------- in this expansion of `other_error_from_bang!`
-LL |     custom_quote::custom_quote! {
-LL |         my_ident
-   |         ^^^^^^^^ not found in this scope
-   |
-  ::: $DIR/span-from-proc-macro.rs:16:5
-   |
-LL |     other_error_from_bang!();
-   |     ------------------------ in this macro invocation
-
 error[E0308]: mismatched types
-  --> $DIR/auxiliary/span-from-proc-macro.rs:12:36
+  --> $DIR/auxiliary/span-from-proc-macro.rs:16:1
    |
-LL |             let bang_error: bool = 25;
-   |                             ----   ^^ expected `bool`, found integer
-   |                             |
-   |                             expected due to this
-...
 LL | pub fn error_from_bang(_input: TokenStream) -> TokenStream {
-   | ---------------------------------------------------------- in this expansion of `error_from_bang!`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | expected `bool`, found integer
+   | expected due to this
+   | in this expansion of `error_from_bang!`
    |
-  ::: $DIR/span-from-proc-macro.rs:15:5
+  ::: $DIR/span-from-proc-macro.rs:14:5
    |
 LL |     error_from_bang!();
    |     ------------------ in this macro invocation
 
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0308, E0412, E0425.
+Some errors have detailed explanations: E0308, E0412.
 For more information about an error, try `rustc --explain E0308`.