Refactor to improve a bunch of states

*   Improve passing stuff around
*   Add traits to enums for markers and such
*   Fix “life time” stuff I didn’t understand

1 files changed, 3 insertions, 4 deletions

diff --git a/src/construct/autolink.rs b/src/construct/autolink.rs
index c9596a6..8376b98 100644
--- a/src/construct/autolink.rs
+++ b/src/construct/autolink.rs
@@ -266,12 +266,11 @@ fn email_label(tokenizer: &mut Tokenizer, code: Code, size: usize) -> StateFnRes
             )
         }
         Code::Char('>') => {
-            let tail_index = tokenizer.events.len();
-            let head_index = tokenizer.events.len() - 1;
+            let index = tokenizer.events.len();
             tokenizer.exit(TokenType::AutolinkProtocol);
             // Change the token type.
-            tokenizer.events[head_index].token_type = TokenType::AutolinkEmail;
-            tokenizer.events[tail_index].token_type = TokenType::AutolinkEmail;
+            tokenizer.events[index - 1].token_type = TokenType::AutolinkEmail;
+            tokenizer.events[index].token_type = TokenType::AutolinkEmail;
             end(tokenizer, code)
         }
         _ => email_value(tokenizer, code, size),