Merge branch 'main' into unusued-variables

1 files changed, 23 insertions, 6 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 40bae2b..e8b6c54 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -771,9 +771,14 @@ mod tests {
     #[macro_export]
     macro_rules! assert_errs {
         ($result:expr, [ $( $kind:pat ),* ]) => {
-            eprintln!("{} => {:?}", stringify!($result), $result);
-            assert!(matches!(
-                $result.unwrap_err().as_slice(),
+            let errs = if let Err(errs) = $result {
+                errs
+            } else {
+                eprintln!("    Program succeeded when it should've failed");
+                unreachable!();
+            };
+            if !matches!(
+                errs.as_slice(),
                 &[$($crate::error::Error {
                     kind: $kind,
                     file: _,
@@ -781,7 +786,19 @@ mod tests {
                     message: _,
                 },
                 )*]
-            ))
+            ) {
+                eprintln!("Unexpected errors");
+                eprint!("    Got:  [");
+                for err in errs {
+                    eprint!(" ErrorKind::{:?} ", err.kind);
+                }
+                eprint!("]\n    Want: [");
+                $(
+                eprint!(" {} ", stringify!($kind));
+                )*
+                eprintln!("]");
+                assert!(false);
+            }
         };
     }
 
@@ -831,8 +848,8 @@ mod tests {
                             for e in errs.iter() {
                                 println!("{}", e);
                             }
-                            println!("  {} - FAILED\n", stringify!($fn));
-                            panic!();
+                            eprintln!("  {} - failed\n", stringify!($fn));
+                            unreachable!();
                         }
                     }
                 });