From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Apr 2021 12:55:01 +0000 (+0100)
Subject: want: Fix extra debug case
X-Git-Tag: otter-0.5.0~319
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=61afc610594a19f7ab7d6b34dc289fb8cbf2a6d5;p=otter.git

want: Fix extra debug case

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/utils.rs b/src/utils.rs
index 4ca64a88..c24082d6 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -440,7 +440,7 @@ macro_rules! want_failed_internal {
 	                  stringify!($variant), stringify!($binding),
                           stringify!($input), $x);
       $(
-        write!(&mut s, " {}={:?}", stringify!($d), &$d);
+        write!(&mut s, " {}={:?}", stringify!($d), &$d).unwrap();
       )*
       s
     }).tolerate()
@@ -455,7 +455,7 @@ macro_rules! want {
     match $input {
       $variant(y) => Some(y),
       x => {
-        want_failed_internal!{ $variant(_)=$input, x, $($d:expr),* }
+        want_failed_internal!{ $variant(_)=$input, x, $($d),* }
         None
       },
     };