Trigger errors without macros, remove unwrap_or_else! and go_match! (#600)

* Remove unwrap_or_else macro entirely

Signed-off-by: Simon Wülker <[email protected]>

* Remove go_match! macro entirely

Signed-off-by: Simon Wülker <[email protected]>

* Remove error_eof shorthand

Signed-off-by: Simon Wülker <[email protected]>

* Remove error shorthand from tokenizer DSL

Signed-off-by: Simon Wülker <[email protected]>

---------

Signed-off-by: Simon Wülker <[email protected]>

Author: simonwuelker

html5ever/src/macros.rs

@@ -7,22 +7,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-macro_rules! unwrap_or_else {
-    ($opt:expr, $else_block:block) => {{
-        let Some(x) = $opt else { $else_block };
-        x
-    }};
-}
-
 macro_rules! unwrap_or_return {
-    ($opt:expr) => {
-        unwrap_or_else!($opt, {
+    ($opt:expr) => {{
+        let Some(x) = $opt else {
             return;
-        })
-    };
-    ($opt:expr, $retval:expr) => {
-        unwrap_or_else!($opt, { return $retval })
-    };
+        };
+        x
+    }};
+    ($opt:expr, $retval:expr) => {{
+        let Some(x) = $opt else {
+            return $retval;
+        };
+        x
+    }};
 }
 
 macro_rules! time {