fix: clippy complaints in the code

Author: ar3s3ru

eventually-postgres/src/lib.rs

@@ -13,15 +13,15 @@ pub mod event;
 
 pub(crate) static MIGRATIONS: sqlx::migrate::Migrator = sqlx::migrate!("./migrations");
 
+use std::sync::LazyLock;
+
 use eventually::version::{ConflictError, Version};
-use lazy_static::lazy_static;
 use regex::Regex;
 
-lazy_static! {
-    static ref CONFLICT_ERROR_REGEX: Regex =
-        Regex::new(r"version check failed, expected: (?P<expected>\d), got: (?P<got>\d)")
-            .expect("regex compiles successfully");
-}
+static CONFLICT_ERROR_REGEX: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(r"version check failed, expected: (?P<expected>\d), got: (?P<got>\d)")
+        .expect("regex compiles successfully")
+});
 
 pub(crate) fn check_for_conflict_error(err: &sqlx::Error) -> Option<ConflictError> {
     fn capture_to_version(captures: &regex::Captures, name: &'static str) -> Version {

eventually/src/event/store.rs

@@ -343,8 +343,9 @@ where
 #[allow(clippy::semicolon_if_nothing_returned)] // False positives :shrugs:
 #[cfg(test)]
 mod test {
+    use std::sync::LazyLock;
+
     use futures::TryStreamExt;
-    use lazy_static::lazy_static;
 
     use super::*;
     use crate::event;
@@ -354,13 +355,13 @@ mod test {
 
     const STREAM_ID: &str = "stream:test";
 
-    lazy_static! {
-        static ref EVENTS: Vec<event::Envelope<StringMessage>> = vec![
+    static EVENTS: LazyLock<Vec<event::Envelope<StringMessage>>> = LazyLock::new(|| {
+        vec![
             event::Envelope::from(StringMessage("event-1")),
             event::Envelope::from(StringMessage("event-2")),
             event::Envelope::from(StringMessage("event-3")),
-        ];
-    }
+        ]
+    });
 
     #[tokio::test]
     async fn it_works() {

examples/Cargo.toml

@@ -59,7 +59,7 @@ impl Message for BankAccountEvent {
             BankAccountEvent::TransferWasReceived { .. } => "BankAccountTransferWasReceived",
             BankAccountEvent::TransferWasDeclined { .. } => "BankAccountTransferWasDeclined",
             BankAccountEvent::TransferWasConfirmed { .. } => "BankAccountTransferWasConfirmed",
-            BankAccountEvent::WasClosed { .. } => "BankAccountWasClosed",
+            BankAccountEvent::WasClosed => "BankAccountWasClosed",
             BankAccountEvent::WasReopened { .. } => "BankAccountWasReopened",
         }
     }
@@ -233,7 +233,7 @@ impl BankAccountRoot {
             return Err(BankAccountError::InsufficientFunds);
         }
 
-        let transaction_already_pending = self.pending_transactions.get(&transaction.id).is_some();
+        let transaction_already_pending = self.pending_transactions.contains_key(&transaction.id);
         if transaction_already_pending {
             return Ok(());
         }
@@ -275,7 +275,7 @@ impl BankAccountRoot {
         &mut self,
         transaction_id: TransactionId,
     ) -> Result<(), BankAccountError> {
-        let is_transaction_recorded = self.pending_transactions.get(&transaction_id).is_some();
+        let is_transaction_recorded = self.pending_transactions.contains_key(&transaction_id);
         if !is_transaction_recorded {
             // TODO: return error
         }