Merge pull request #89 from eddyb/fix-trailing-comma

tests: ignore trailing commas in {:#?} output.
rust-lang · Apr 6, 2019 · 94ce9c1 · 94ce9c1
2 parents 44ffe0d + 7aa39f3
commit 94ce9c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/macros/tests/basic.rs b/macros/tests/basic.rs
@@ -12,8 +12,13 @@ macro_rules! testcases {
         fn $name() {
             $name::$rule::parse_with($input, |parser, result| {
                 let result = format!("{:#?}", result.unwrap());
+                // FIXME(eddyb) Remove this trailing-comma-ignoring hack
+                // once rust-lang/rust#59076 reaches the stable channel.
+                let normalize = |s: &str| {
+                    s.replace(",\n", "\n")
+                };
                 assert!(
-                    result == $expected,
+                    normalize(&result) == normalize($expected),
                     "mismatched output, expected:\n{}\n\nfound:\n{}",
                     $expected,
                     result

diff --git a/macros/tests/json.rs b/macros/tests/json.rs
@@ -111,8 +111,13 @@ Value::Object {
         }
     ]
 }";
+            // FIXME(eddyb) Remove this trailing-comma-ignoring hack
+            // once rust-lang/rust#59076 reaches the stable channel.
+            let normalize = |s: &str| {
+                s.replace(",\n", "\n")
+            };
             assert!(
-                result == expected,
+                normalize(&result) == normalize(expected),
                 "mismatched output, expected:\n{}\n\nfound:\n{}",
                 expected,
                 result