utils: Many fixes to want_let

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

diff --git a/src/utils.rs b/src/utils.rs
index 853be507b3d0e733c9a65263f7b9a9129565fab0..457572cdd3f9449ffe80bc99fd054bbfac3a9896 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -480,7 +480,9 @@ macro_rules! want_let {
     let $binding = match $input {
       $($variant(y))::+ => y,
       x => {
-        want_failed_internal!{ $variant($binding)=$input, x, $($d:expr),* }
+        want_failed_internal!{
+          $($variant)::+($binding)=$input, x, $($d),*
+        }
         $($otherwise)*
       },
     };
@@ -488,7 +490,7 @@ macro_rules! want_let {
   { $($variant:ident)::+($binding:pat) = $input:expr;
     else $($otherwise:tt)*
   } => {
-    want_let!{ $($variant(y))::+ = $input; ?; $($otherwise)* }
+    want_let!{ $($variant($binding))::+ = $input; else ?; $($otherwise)* }
   };
 }