From: Skgland <bb-github@t-online.de>
Date: Sat, 6 Feb 2021 18:52:41 +0000 (+0100)
Subject: fix clippy lint match|if let looks like matches! macro
X-Git-Tag: v0.9.0~150^2~65^2~6^2~5
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=1571690bbbdfcc8d3997ea00f5b07291b26ab6dc;p=scryer-prolog.git

fix clippy lint match|if let looks like matches! macro
---

diff --git a/crates/prolog_parser/src/ast.rs b/crates/prolog_parser/src/ast.rs
index 6f05bcba..6b7534cf 100644
--- a/crates/prolog_parser/src/ast.rs
+++ b/crates/prolog_parser/src/ast.rs
@@ -187,10 +187,7 @@ impl RegType {
     }
 
     pub fn is_perm(self) -> bool {
-        match self {
-            RegType::Perm(_) => true,
-            _ => false,
-        }
+        matches!(self, RegType::Perm(_))
     }
 }
 
@@ -305,27 +302,15 @@ pub enum DoubleQuotes {
 
 impl DoubleQuotes {
     pub fn is_chars(self) -> bool {
-        if let DoubleQuotes::Chars = self {
-            true
-        } else {
-            false
-        }
+        matches!(self, DoubleQuotes::Chars)
     }
 
     pub fn is_atom(self) -> bool {
-        if let DoubleQuotes::Atom = self {
-            true
-        } else {
-            false
-        }
+        matches!(self, DoubleQuotes::Atom)
     }
 
     pub fn is_codes(self) -> bool {
-        if let DoubleQuotes::Codes = self {
-            true
-        } else {
-            false
-        }
+        matches!(self, DoubleQuotes::Codes)
     }
 }
 
@@ -674,11 +659,7 @@ impl ClauseName {
     pub fn has_table_of(&self, other: &ClauseName) -> bool {
         match self {
             ClauseName::BuiltIn(_) => {
-                if let ClauseName::BuiltIn(_) = other {
-                    true
-                } else {
-                    false
-                }
+                matches!(other, ClauseName::BuiltIn(_))
             }
             ClauseName::User(ref name) => other.has_table(&name.table),
         }
diff --git a/crates/prolog_parser/src/parser.rs b/crates/prolog_parser/src/parser.rs
index 4ff09eb6..b67924c0 100644
--- a/crates/prolog_parser/src/parser.rs
+++ b/crates/prolog_parser/src/parser.rs
@@ -28,18 +28,18 @@ enum TokenType {
 
 impl TokenType {
     fn is_sep(self) -> bool {
-        match self {
+        matches!(
+            self,
             TokenType::HeadTailSeparator
-            | TokenType::OpenCT
-            | TokenType::Open
-            | TokenType::Close
-            | TokenType::OpenList
-            | TokenType::CloseList
-            | TokenType::OpenCurly
-            | TokenType::CloseCurly
-            | TokenType::Comma => true,
-            _ => false,
-        }
+                | TokenType::OpenCT
+                | TokenType::Open
+                | TokenType::Close
+                | TokenType::OpenList
+                | TokenType::CloseList
+                | TokenType::OpenCurly
+                | TokenType::CloseCurly
+                | TokenType::Comma
+        )
     }
 }