]> Repositorios git - scryer-prolog.git/commitdiff
fix clippy lint match|if let looks like matches! macro
authorSkgland <[email protected]>
Sat, 6 Feb 2021 18:52:41 +0000 (19:52 +0100)
committerSkgland <[email protected]>
Sat, 6 Feb 2021 21:13:05 +0000 (22:13 +0100)
crates/prolog_parser/src/ast.rs
crates/prolog_parser/src/parser.rs

index 6f05bcba6e561c6a0a820e8bef2b68ab0772b85b..6b7534cf05844628642d0983955608f8fdaf2be6 100644 (file)
@@ -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),
         }
index 4ff09eb63091926296c1f636ea38a193d6e22de7..b67924c06bbe16419d02d29cd648ed6a1b9bf4bb 100644 (file)
@@ -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
+        )
     }
 }