Use matches!

diff --git a/src/activity_stack.rs b/src/activity_stack.rs
index e040fd20f5df1f02fee23446a25379ce55920ff9..6fd4e0dade49ced473476f1511cd72dfd88030d6 100644 (file)
--- a/src/activity_stack.rs
+++ b/src/activity_stack.rs
@@ -97,10 +97,7 @@ impl Activity {
         // This even counts the ReadMentions activity _itself_ - it
         // gets reinitialised, because that's the simplest way to jump
         // you down to the new message.
-        match self {
-            Activity::Compose(_) => false,
-            _ => true,
-        }
+        matches!(self, Activity::Compose(_))
     }
 }
 

diff --git a/src/login.rs b/src/login.rs
index d8e61361cd9b57d0127ae95f892a65257abb71d3..ab64a2f745a0dbcbabd1fd7f4edb220a26d8fd6c 100644 (file)
--- a/src/login.rs
+++ b/src/login.rs
@@ -146,12 +146,10 @@ impl Password {
     }
 
     fn ok(&self) -> bool {
-        match self.diagnostic() {
-            PasswordDiagnostic::OrigGood | PasswordDiagnostic::ConfirmGood => {
-                true
-            }
-            _ => false,
-        }
+        matches!(
+            self.diagnostic(),
+            PasswordDiagnostic::OrigGood | PasswordDiagnostic::ConfirmGood,
+        )
     }
 }
 impl EditableMenuLineData for Password {