Fix mir parser to allow consecutive symbols

rust/rust_mir_macro/src/parse.rs

@@ -40,19 +40,18 @@ pub fn do_punct<I: Iterator<Item = TokenTree>>(
         while let Some(TokenTree::Punct(c)) = tree.peek_next() {
             tok.push(c.as_char());
             let _ = span.get_or_insert(c.span());
+            if tok == punct {
+                return Ok(span.unwrap());
+            }
             if c.spacing() != Spacing::Joint {
                 break;
             }
         }
 
-        if tok != punct {
-            return Err(Error {
-                text: format!("Expected {}, got `{}`", punct, tok),
-                span: span.unwrap_or_else(Span::call_site),
-            });
-        }
-
-        return Ok(span.unwrap());
+        return Err(Error {
+            text: format!("Expected {}, got `{}`", punct, tok),
+            span: span.unwrap_or_else(Span::call_site),
+        });
     })
 }
 

rust/src/sema.rs

@@ -3741,13 +3741,13 @@ pub fn convert_crate(
         let body = if retty == Type::Never {
             mir::mir! {
                 @0: { []
-                    tailcall # <main> : <fnty>()
+                    tailcall #<main>: <fnty>()
                 }
             }
         } else {
             mir::mir! {
                 @0: { []
-                    call _0 = # <main> : <fnty>() next @1 []
+                    call _0 = #<main>: <fnty>() next @1 []
                 }
                 @1: { [_0]
                     store dead _0;

test/rust/exit_42.rs

@@ -2,8 +2,6 @@ extern "C" {
     fn exit(status: i32) -> !;
 }
 
-fn main() {
-    unsafe {
-        exit(42);
-    }
+fn main() -> ! {
+    unsafe { exit(42) }
 }

test/rust/intrin_abort.rs

@@ -2,6 +2,6 @@ extern "rust-intrinsic" {
     pub fn __builtin_abort() -> !;
 }
 
-fn main() {
-    __builtin_abort();
+fn main() -> ! {
+    __builtin_abort()
 }