rustfmt & clippy

Author: elpiel

sentry/src/application.rs

@@ -1,4 +1,7 @@
-use std::{net::{IpAddr, Ipv4Addr, SocketAddr}, path::Path};
+use std::{
+    net::{IpAddr, Ipv4Addr, SocketAddr},
+    path::Path,
+};
 
 use adapter::client::Locked;
 use hyper::{
@@ -9,7 +12,7 @@ use once_cell::sync::Lazy;
 use primitives::{config::Environment, ValidatorId};
 use redis::ConnectionInfo;
 use serde::{Deserialize, Deserializer};
-use simple_hyper_server_tls::{listener_from_pem_files, TlsListener, Protocols};
+use simple_hyper_server_tls::{listener_from_pem_files, Protocols, TlsListener};
 use slog::{error, info};
 
 use crate::{
@@ -185,7 +188,7 @@ impl<C: Locked + 'static> Application<C> {
                 if let Err(e) = server.await {
                     error!(&logger, "server error: {}", e; "main" => "run");
                 }
-            },
+            }
             EnableTls::Tls { listener, .. } => {
                 let make_service = make_service_fn(|_| {
                     let server = self.clone();
@@ -204,7 +207,7 @@ impl<C: Locked + 'static> Application<C> {
                     // This is usually caused by trying to connect on HTTP instead of HTTPS
                     error!(&logger, "server error: {}", e; "main" => "run");
                 }
-            },
+            }
         }
     }
 }
@@ -229,12 +232,17 @@ pub enum EnableTls {
     Tls {
         socket_addr: SocketAddr,
         listener: TlsListener,
-    }
+    },
 }
 
 impl EnableTls {
-    pub fn new_tls<C: AsRef<Path>, K: AsRef<Path>>(certificates: C, private_keys: K, socket_addr: SocketAddr) -> Result<Self, Box<dyn std::error::Error>> {
-        let listener = listener_from_pem_files(certificates, private_keys, Protocols::ALL, &socket_addr)?;
+    pub fn new_tls<C: AsRef<Path>, K: AsRef<Path>>(
+        certificates: C,
+        private_keys: K,
+        socket_addr: SocketAddr,
+    ) -> Result<Self, Box<dyn std::error::Error>> {
+        let listener =
+            listener_from_pem_files(certificates, private_keys, Protocols::ALL, &socket_addr)?;
 
         Ok(Self::Tls {
             listener,

sentry/src/db.rs

@@ -96,7 +96,7 @@ pub fn setup_migrations(environment: Environment) {
 
     // NOTE: Make sure to update list of migrations for the tests as well!
     // `tests_postgres::MIGRATIONS`
-    let mut migrations = vec![make_migration!("20190806011140_initial-tables")];
+    let migrations = vec![make_migration!("20190806011140_initial-tables")];
 
     // if let Environment::Development = environment {
     //     // seeds database tables for testing

sentry/src/db/channel.rs

@@ -90,6 +90,7 @@ mod list_channels {
         let mut params_total: Vec<Box<(dyn ToSql + Send + Sync)>> = vec![];
 
         if !chains.is_empty() {
+            #[allow(clippy::type_complexity)]
             let (chain_params, chain_params_total): (
                 Vec<Box<dyn ToSql + Send + Sync>>,
                 Vec<Box<dyn ToSql + Send + Sync>>,
@@ -110,18 +111,15 @@ mod list_channels {
             where_clauses.push(format!("chain_id IN ({})", params_prepared));
         }
 
-        match validator {
-            Some(validator) => {
-                // params are 1-indexed
-                where_clauses.push(format!(
-                    "(leader = ${validator_param} OR follower = ${validator_param})",
-                    validator_param = params.len() + 1
-                ));
-                // then add the new param to the list!
-                params.push(Box::new(validator) as _);
-                params_total.push(Box::new(validator) as _);
-            }
-            _ => {}
+        if let Some(validator) = validator {
+            // params are 1-indexed
+            where_clauses.push(format!(
+                "(leader = ${validator_param} OR follower = ${validator_param})",
+                validator_param = params.len() + 1
+            ));
+            // then add the new param to the list!
+            params.push(Box::new(validator) as _);
+            params_total.push(Box::new(validator) as _);
         }
 
         // To understand why we use Order by, see Postgres Documentation: https://www.postgresql.org/docs/8.1/queries-limit.html
@@ -169,7 +167,7 @@ limit, skip)
                 where_clauses.join(" AND ")
             )
         } else {
-            format!("SELECT COUNT(id)::varchar FROM channels")
+            "SELECT COUNT(id)::varchar FROM channels".to_string()
         };
 
         let stmt = client.prepare(&statement).await?;

sentry/src/main.rs

@@ -2,7 +2,7 @@
 #![deny(rust_2018_idioms)]
 
 use adapter::{primitives::AdapterTypes, Adapter};
-use clap::{crate_version, Arg, Command, value_parser};
+use clap::{crate_version, value_parser, Arg, Command};
 
 use primitives::{
     config::configuration, postgres::POSTGRES_CONFIG, test_util::DUMMY_AUTH,

test_harness/src/deposits.rs

@@ -11,6 +11,6 @@ pub struct Deposit {
 
 impl PartialEq<primitives::Deposit<BigNum>> for Deposit {
     fn eq(&self, other: &primitives::Deposit<BigNum>) -> bool {
-        &self.outpace_amount == &other.total
+        self.outpace_amount == other.total
     }
 }