1 files changed, 41 insertions, 7 deletions

diff --git a/crates/mbe/src/tests.rs b/crates/mbe/src/tests.rs
index 1d9afb4fb..bd2977ebd 100644
--- a/crates/mbe/src/tests.rs
+++ b/crates/mbe/src/tests.rs
@@ -1,7 +1,11 @@
 use std::fmt::Write;
 
 use ::parser::FragmentKind;
-use syntax::{ast, AstNode, NodeOrToken, SyntaxKind::IDENT, SyntaxNode, WalkEvent, T};
+use syntax::{
+    ast, AstNode, NodeOrToken,
+    SyntaxKind::{ERROR, IDENT},
+    SyntaxNode, WalkEvent, T,
+};
 use test_utils::assert_eq_text;
 
 use super::*;
@@ -257,7 +261,6 @@ fn test_expr_order() {
 
     let dump = format!("{:#?}", expanded);
     assert_eq_text!(
-        dump.trim(),
         r#"[email protected]
   [email protected]
     [email protected] "fn"
@@ -281,6 +284,7 @@ fn test_expr_order() {
             [email protected] "2"
         [email protected] ";"
       [email protected] "}""#,
+        dump.trim()
     );
 }
 
@@ -985,7 +989,6 @@ fn test_tt_composite2() {
 
     let res = format!("{:#?}", &node);
     assert_eq_text!(
-        res.trim(),
         r###"[email protected]
   [email protected]
     [email protected]
@@ -999,7 +1002,8 @@ fn test_tt_composite2() {
       [email protected] ">"
       [email protected] " "
       [email protected] "#"
-      [email protected] ")""###
+      [email protected] ")""###,
+        res.trim()
     );
 }
 
@@ -1080,6 +1084,19 @@ fn test_vertical_bar_with_pat() {
 }
 
 #[test]
+fn test_dollar_crate_lhs_is_not_meta() {
+    parse_macro(
+        r#"
+macro_rules! foo {
+    ($crate) => {};
+    () => {0};
+}
+    "#,
+    )
+    .assert_expand_items(r#"foo!{}"#, r#"0"#);
+}
+
+#[test]
 fn test_lifetime() {
     parse_macro(
         r#"
@@ -1181,6 +1198,23 @@ macro_rules! foo {
     );
 }
 
+#[test]
+fn test_expr_after_path_colons() {
+    assert!(parse_macro(
+        r#"
+macro_rules! m {
+    ($k:expr) => {
+            f(K::$k);
+       }
+}
+"#,
+    )
+    .expand_statements(r#"m!(C("0"))"#)
+    .descendants()
+    .find(|token| token.kind() == ERROR)
+    .is_some());
+}
+
 // The following tests are based on real world situations
 #[test]
 fn test_vec() {
@@ -1708,7 +1742,7 @@ impl MacroFixture {
     fn assert_expand(&self, invocation: &str, expected: &str) {
         let expansion = self.expand_tt(invocation);
         let actual = format!("{:?}", expansion);
-        test_utils::assert_eq_text!(&actual.trim(), &expected.trim());
+        test_utils::assert_eq_text!(&expected.trim(), &actual.trim());
     }
 
     fn assert_expand_items(&self, invocation: &str, expected: &str) -> &MacroFixture {
@@ -1907,7 +1941,6 @@ fn test_no_space_after_semi_colon() {
 
     let dump = format!("{:#?}", expanded);
     assert_eq_text!(
-        dump.trim(),
         r###"[email protected]
   [email protected]
     [email protected]
@@ -1947,6 +1980,7 @@ fn test_no_space_after_semi_colon() {
     [email protected]
       [email protected] "f"
     [email protected] ";""###,
+        dump.trim()
     );
 }
 
@@ -1954,7 +1988,7 @@ fn test_no_space_after_semi_colon() {
 #[test]
 fn test_rustc_issue_57597() {
     fn test_error(fixture: &str) {
-        assert_eq!(parse_macro_error(fixture), ParseError::RepetitionEmtpyTokenTree);
+        assert_eq!(parse_macro_error(fixture), ParseError::RepetitionEmptyTokenTree);
     }
 
     test_error("macro_rules! foo { ($($($i:ident)?)+) => {}; }");