rustfmt

Author: elpiel

primitives/src/ad_unit.rs

@@ -58,8 +58,8 @@ mod postgres {
     use super::AdUnit;
 
     use bytes::BytesMut;
-    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
     impl<'a> FromSql<'a> for AdUnit {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {
             let json = <Json<Self> as FromSql>::from_sql(ty, raw)?;

primitives/src/address.rs

@@ -177,8 +177,8 @@ pub mod postgres {
     use super::Address;
     use crate::ToETHChecksum;
     use bytes::BytesMut;
-    use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
 
     impl<'a> FromSql<'a> for Address {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {

primitives/src/big_num.rs

@@ -323,8 +323,8 @@ where
 pub mod postgres {
     use super::BigNum;
     use bytes::BytesMut;
-    use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
 
     impl<'a> FromSql<'a> for BigNum {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<BigNum, Box<dyn Error + Sync + Send>> {

primitives/src/campaign.rs

@@ -375,8 +375,8 @@ mod postgres {
 
     use super::{Active, Campaign, CampaignId, PricingBounds, Validators};
     use bytes::BytesMut;
-    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
     use tokio_postgres::Row;
 
     impl From<&Row> for Campaign {

primitives/src/channel.rs

@@ -298,8 +298,8 @@ pub mod postgres {
     use super::{Channel, ChannelId, Nonce};
     use bytes::BytesMut;
     use hex::FromHex;
-    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, ToSql, Type};
     use tokio_postgres::Row;
 
     impl<'a> FromSql<'a> for ChannelId {

primitives/src/event_submission.rs

@@ -32,8 +32,8 @@ mod postgres {
     use super::EventSubmission;
 
     use bytes::BytesMut;
-    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
 
     impl<'a> FromSql<'a> for EventSubmission {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {

primitives/src/sentry.rs

@@ -608,10 +608,12 @@ mod postgres {
         validator::{messages::Type as MessageType, MessageTypes},
     };
     use bytes::BytesMut;
-    use tokio_postgres::types::{accepts, to_sql_checked, IsNull, Json, ToSql, Type};
     use serde::Deserialize;
     use std::convert::TryFrom;
-    use tokio_postgres::{Error, Row};
+    use tokio_postgres::{
+        types::{accepts, to_sql_checked, IsNull, Json, ToSql, Type},
+        Error, Row,
+    };
 
     impl From<&Row> for EventAggregate {
         fn from(row: &Row) -> Self {

primitives/src/targeting/eval.rs

@@ -1228,8 +1228,8 @@ fn math_operator(lhs: Number, rhs: Number, ops: MathOperator) -> Result<Number,
 pub mod postgres {
     use super::*;
     use bytes::BytesMut;
-    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
     use std::error::Error;
+    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
 
     impl ToSql for Rules {
         fn to_sql(

primitives/src/unified_num.rs

@@ -433,11 +433,11 @@ mod test {
 mod postgres {
     use super::UnifiedNum;
     use bytes::BytesMut;
-    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, ToSql, Type};
     use std::{
         convert::{TryFrom, TryInto},
         error::Error,
     };
+    use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, ToSql, Type};
 
     impl<'a> FromSql<'a> for UnifiedNum {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<UnifiedNum, Box<dyn Error + Sync + Send>> {

primitives/src/validator.rs

@@ -361,9 +361,9 @@ pub mod postgres {
     use super::ValidatorId;
     use crate::ToETHChecksum;
     use bytes::BytesMut;
-    use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
     use std::convert::TryFrom;
     use std::error::Error;
+    use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
 
     impl<'a> FromSql<'a> for ValidatorId {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<Self, Box<dyn Error + Sync + Send>> {

sentry/src/access.rs

@@ -169,7 +169,7 @@ mod test {
 
     use chrono::TimeZone;
     use primitives::{
-        config::{DEVELOPMENT_CONFIG},
+        config::DEVELOPMENT_CONFIG,
         event_submission::{RateLimit, Rule},
         sentry::Event,
         util::tests::prep_db::{ADDRESSES, DUMMY_CAMPAIGN, IDS},

sentry/src/db.rs

@@ -334,13 +334,19 @@ pub mod tests_postgres {
                 // set the database in the configuration of the inside Pool (used for tests)
                 config.dbname(&database.name);
 
-                let manager =
-                    deadpool_postgres::Manager::from_config(config, NoTls, self.manager_config.clone());
-                
+                let manager = deadpool_postgres::Manager::from_config(
+                    config,
+                    NoTls,
+                    self.manager_config.clone(),
+                );
+
                 deadpool_postgres::Pool::new(manager, 15)
             };
 
-            let result = database.pool.get().await?
+            let result = database
+                .pool
+                .get()
+                .await?
                 .simple_query(queries)
                 .await
                 .map_err(PoolError::Backend)

test_harness/src/lib.rs

@@ -730,7 +730,9 @@ pub mod run {
         let postgres = postgres_connection(42, postgres_config).await;
         let mut redis = redis_connection(app_config.redis_url).await?;
 
-        Manager::flush_db(&mut redis).await.expect("Should flush redis database");
+        Manager::flush_db(&mut redis)
+            .await
+            .expect("Should flush redis database");
 
         let campaign_remaining = CampaignRemaining::new(redis.clone());