From d703a55f2ffaa556272b8e2c2cabcfb74b65d2d1 Mon Sep 17 00:00:00 2001
From: Martin Hoffmann <martin@nlnetlabs.nl>
Date: Thu, 27 Aug 2020 11:39:36 +0200
Subject: [PATCH] There is a matches macro now.

---
 src/master/scan.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/master/scan.rs b/src/master/scan.rs
index 6cfcef02..687d56f9 100644
--- a/src/master/scan.rs
+++ b/src/master/scan.rs
@@ -124,10 +124,7 @@ impl<C: CharSource> Scanner<C> {
 impl<C: CharSource> Scanner<C> {
     /// Returns whether the scanner has reached the end of data.
     pub fn eof_reached(&mut self) -> bool {
-        match self.peek() {
-            Ok(Some(_)) => false,
-            _ => true
-        }
+        !matches!(self.peek(), Ok(Some(_)))
     }
 
     /// Returns the current position of the scanner.
@@ -1084,10 +1081,7 @@ impl Token {
 
     /// Returns whether the token is a newline.
     fn is_newline(self) -> bool {
-        match self {
-            Token::Newline => true,
-            _ => false,
-        }
+        matches!(self, Token::Newline)
     }
 
     /// Returns whether the token starts a newline sequence.