fix clippy warnings

Author: elpiel

adapter/src/ethereum.rs

@@ -62,7 +62,7 @@ impl EthereumAdapter {
         let address = keystore_json["address"]
             .as_str()
             .map(eth_checksum::checksum)
-            .ok_or_else(|| KeystoreError::AddressMissing)?;
+            .ok_or(KeystoreError::AddressMissing)?;
 
         let address = ValidatorId::try_from(&address).map_err(KeystoreError::AddressInvalid)?;
 
@@ -256,10 +256,7 @@ impl Adapter for EthereumAdapter {
     }
 
     fn get_auth(&self, validator: &ValidatorId) -> AdapterResult<String, Self::AdapterError> {
-        let wallet = self
-            .wallet
-            .as_ref()
-            .ok_or_else(|| AdapterError::LockedWallet)?;
+        let wallet = self.wallet.as_ref().ok_or(AdapterError::LockedWallet)?;
 
         let era = Utc::now().timestamp_millis() as f64 / 60000.0;
         let payload = Payload {

primitives/src/big_num.rs

@@ -259,10 +259,7 @@ pub mod postgres {
         }
 
         fn accepts(ty: &Type) -> bool {
-            match *ty {
-                Type::TEXT | Type::VARCHAR => true,
-                _ => false,
-            }
+            matches!(*ty, Type::TEXT | Type::VARCHAR)
         }
     }
 
@@ -276,10 +273,7 @@ pub mod postgres {
         }
 
         fn accepts(ty: &Type) -> bool {
-            match *ty {
-                Type::TEXT | Type::VARCHAR => true,
-                _ => false,
-            }
+            matches!(*ty, Type::TEXT | Type::VARCHAR)
         }
 
         fn to_sql_checked(

primitives/src/merkle_tree.rs

@@ -99,7 +99,7 @@ impl MerkleTree {
     pub fn new(data: &[MerkleItem]) -> Result<MerkleTree, Error> {
         let mut leaves: Vec<MerkleItem> = data.to_owned();
         // sort the MerkleTree leaves
-        leaves.sort();
+        leaves.sort_unstable();
         // remove duplicates **before** we check the leaves length
         leaves.dedup_by(|a, b| a == b);
 

primitives/src/sentry.rs

@@ -71,17 +71,11 @@ pub enum Event {
 
 impl Event {
     pub fn is_click_event(&self) -> bool {
-        match *self {
-            Event::Click { .. } => true,
-            _ => false,
-        }
+        matches!(self, Event::Click { .. })
     }
 
     pub fn is_impression_event(&self) -> bool {
-        match *self {
-            Event::Impression { .. } => true,
-            _ => false,
-        }
+        matches!(self, Event::Impression { .. })
     }
 }
 

primitives/src/validator.rs

@@ -231,10 +231,7 @@ pub mod postgres {
         }
 
         fn accepts(ty: &Type) -> bool {
-            match *ty {
-                Type::TEXT | Type::VARCHAR => true,
-                _ => false,
-            }
+            matches!(*ty, Type::TEXT | Type::VARCHAR)
         }
     }
 

sentry/src/access.rs

@@ -44,10 +44,7 @@ pub async fn check_access(
     channel: &Channel,
     events: &[Event],
 ) -> Result<(), Error> {
-    let is_close_event = |e: &Event| match e {
-        Event::Close => true,
-        _ => false,
-    };
+    let is_close_event = |e: &Event| matches!(e, Event::Close);
 
     let has_close_event = events.iter().all(is_close_event);
     let current_time = Utc::now();

sentry/src/middleware/auth.rs

@@ -36,18 +36,12 @@ pub(crate) async fn for_request(
     let token = authorization
         .and_then(|hv| {
             hv.to_str()
-                .map(|token_str| {
-                    if token_str.starts_with(prefix) {
-                        Some(token_str[prefix.len()..].to_string())
-                    } else {
-                        None
-                    }
-                })
+                .map(|token_str| token_str.strip_prefix(prefix))
                 .transpose()
         })
         .transpose()?;
 
-    if let Some(ref token) = token {
+    if let Some(token) = token {
         let adapter_session = match redis::cmd("GET")
             .arg(token)
             .query_async::<_, Option<String>>(&mut redis.clone())

sentry/src/middleware/channel.rs

@@ -24,7 +24,7 @@ pub fn channel_load<'a, A: Adapter + 'static>(
             .map_err(|_| ResponseError::BadRequest("Wrong Channel Id".to_string()))?;
         let channel = get_channel_by_id(&app.pool, &channel_id)
             .await?
-            .ok_or_else(|| ResponseError::NotFound)?;
+            .ok_or(ResponseError::NotFound)?;
 
         req.extensions_mut().insert(channel);
 
@@ -58,7 +58,7 @@ pub fn channel_if_active<'a, A: Adapter + 'static>(
 
         let channel = get_channel_by_id_and_validator(&app.pool, &channel_id, &validator_id)
             .await?
-            .ok_or_else(|| ResponseError::NotFound)?;
+            .ok_or(ResponseError::NotFound)?;
 
         req.extensions_mut().insert(channel);
 

sentry/src/routes/event_aggregate.rs

@@ -24,7 +24,7 @@ pub async fn list_channel_event_aggregates<A: Adapter>(
     let auth = req
         .extensions()
         .get::<Auth>()
-        .ok_or_else(|| ResponseError::Unauthorized)?;
+        .ok_or(ResponseError::Unauthorized)?;
 
     let query =
         serde_urlencoded::from_str::<EventAggregatesQuery>(req.uri().query().unwrap_or(""))?;