Work on macro_rules

Author: Aaron1011

compiler/rustc_expand/src/mbe/macro_rules.rs

@@ -151,9 +151,9 @@ impl<'a> ParserAnyMacro<'a> {
         // We allow semicolons at the end of expressions -- e.g., the semicolon in
         // `macro_rules! m { () => { panic!(); } }` isn't parsed by `.parse_expr()`,
         // but `m!()` is allowed in expression positions (cf. issue #34706).
-        if kind == AstFragmentKind::Expr && parser.token == token::Semi {
+        /*if kind == AstFragmentKind::Expr && parser.token == token::Semi {
             parser.bump();
-        }
+        }*/
 
         // Make sure we don't have any tokens left to parse so we don't silently drop anything.
         let path = ast::Path::from_ident(macro_ident.with_span_pos(site_span));

library/core/src/str/validations.rs

@@ -125,7 +125,7 @@ pub(super) fn run_utf8_validation(v: &[u8]) -> Result<(), Utf8Error> {
         let old_offset = index;
         macro_rules! err {
             ($error_len: expr) => {
-                return Err(Utf8Error { valid_up_to: old_offset, error_len: $error_len });
+                return Err(Utf8Error { valid_up_to: old_offset, error_len: $error_len })
             };
         }
 

src/test/ui/hygiene/intercrate.stderr

@@ -1,10 +1,17 @@
-error: type `fn() -> u32 {foo::bar::f}` is private
-  --> $DIR/intercrate.rs:10:16
+error: macro expansion ignores token `;` and any following
+  --> $DIR/auxiliary/intercrate.rs:8:16
+   |
+LL |             f();
+   |                ^
+   | 
+  ::: $DIR/intercrate.rs:10:16
    |
 LL |     assert_eq!(intercrate::foo::m!(), 1);
-   |                ^^^^^^^^^^^^^^^^^^^^^ private type
+   |                ---------------------- help: you might be missing a semicolon here: `;`
+   |                |
+   |                caused by the macro expansion here
    |
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: the usage of `m!` is likely invalid in expression context
 
 error: aborting due to previous error
 

src/test/ui/macros/macro-context.stderr

@@ -9,11 +9,11 @@ LL |     let a: m!();
    |
    = note: the usage of `m!` is likely invalid in type context
 
-error: macro expansion ignores token `typeof` and any following
-  --> $DIR/macro-context.rs:3:17
+error: macro expansion ignores token `;` and any following
+  --> $DIR/macro-context.rs:3:15
    |
 LL |     () => ( i ; typeof );
-   |                 ^^^^^^
+   |               ^
 ...
 LL |     let i = m!();
    |             ---- caused by the macro expansion here

src/test/ui/macros/trace_faulty_macros.stderr

@@ -73,7 +73,7 @@ LL |     let a = pat_macro!();
    |             ^^^^^^^^^^^^
    |
    = note: expanding `pat_macro! {  }`
-   = note: to `pat_macro ! (A { a : a, b : 0, c : _, .. }) ;`
+   = note: to `pat_macro ! (A { a : a, b : 0, c : _, .. })`
    = note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
    = note: to `A { a: a, b: 0, c: _, .. }`