Merge pull request #489 from AmbireTech/rust-1.60

elpiel · web-flow · commit a7c93384a2c4 · 2022-04-15T16:13:06.000+03:00
Run rustfmt &amp; clippy because of Rust 1.60
diff --git a/adview-manager/src/lib.rs b/adview-manager/src/lib.rs
@@ -162,8 +162,8 @@ fn get_unit_html(
 ) -> String {
     // replace all `"` quotes with a single quote `'`
     // these values are used inside `onclick` & `onload` html attributes
-    let on_load = on_load.replace("\"", "'");
-    let on_click = on_click.replace("\"", "'");
+    let on_load = on_load.replace('\"', "'");
+    let on_click = on_click.replace('\"', "'");
     let image_url = normalize_url(&ad_unit.media_url);
 
     let element_html = if is_video(ad_unit) {
@@ -460,7 +460,7 @@ impl Manager {
         // Apply targeting, now with adView.* variables, and sort the resulting ad units
         let mut units_with_price = m_campaigns
             .iter()
-            .map(|m_campaign| {
+            .flat_map(|m_campaign| {
                 // since we are in a Iterator.map(), we can't use async, so we block
                 if block_on(self.is_campaign_sticky(m_campaign.campaign.id)) {
                     return vec![];
@@ -498,7 +498,6 @@ impl Manager {
                     .map(|uwp| (uwp.clone(), campaign_id))
                     .collect()
             })
-            .flatten()
             .filter(|x| !(self.options.disabled_video && is_video(&x.0.unit)))
             .collect::<Vec<_>>();
 
diff --git a/primitives/src/balances.rs b/primitives/src/balances.rs
@@ -73,12 +73,11 @@ impl<S: BalancesState> Balances<S> {
         self.spenders
             .values()
             .sum::<Option<UnifiedNum>>()
-            .map(|spenders| {
+            .and_then(|spenders| {
                 let earners = self.earners.values().sum::<Option<UnifiedNum>>()?;
 
                 Some((earners, spenders))
             })
-            .flatten()
     }
 }
 
diff --git a/sentry/src/access.rs b/sentry/src/access.rs
@@ -143,8 +143,7 @@ fn forbidden_referrer(session: &Session) -> bool {
     match session
         .referrer_header
         .as_ref()
-        .map(|rf| rf.split('/').nth(2))
-        .flatten()
+        .and_then(|rf| rf.split('/').nth(2))
     {
         Some(hostname) => {
             hostname == "localhost"
diff --git a/sentry/src/db.rs b/sentry/src/db.rs
@@ -173,15 +173,15 @@ pub mod tests_postgres {
         };
         let manager = Manager::new(POSTGRES_CONFIG.clone(), manager_config, db_prefix)?;
 
-        Ok(Pool::builder(manager)
+        Pool::builder(manager)
             .max_size(15)
             .build()
             .map_err(|err| match err {
                 deadpool::managed::BuildError::Backend(err) => err,
                 deadpool::managed::BuildError::NoRuntimeSpecified(message) => {
                     Error::Build(deadpool::managed::BuildError::NoRuntimeSpecified(message))
                 }
-            })?)
+            })
     }
 
     /// A Database is used to isolate test runs from each other
diff --git a/sentry/src/middleware/auth.rs b/sentry/src/middleware/auth.rs
@@ -82,8 +82,7 @@ async fn for_request<C: Locked>(
     let referrer = req
         .headers()
         .get(REFERER)
-        .map(|hv| hv.to_str().ok().map(ToString::to_string))
-        .flatten();
+        .and_then(|hv| hv.to_str().ok().map(ToString::to_string));
 
     let session = Session {
         ip: get_request_ip(&req),
@@ -147,8 +146,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {
         .get("true-client-ip")
         .or_else(|| req.headers().get("x-forwarded-for"))
         .and_then(|hv| hv.to_str().map(ToString::to_string).ok())
-        .map(|token| token.split(',').next().map(ToString::to_string))
-        .flatten()
+        .and_then(|token| token.split(',').next().map(ToString::to_string))
 }
 
 #[cfg(test)]
diff --git a/sentry/src/middleware/campaign.rs b/sentry/src/middleware/campaign.rs
@@ -34,9 +34,7 @@ impl<C: Locked + 'static> Middleware<C> for CampaignLoad {
         let campaign_context = application
             .config
             .find_chain_of(campaign.channel.token)
-            .ok_or(ResponseError::BadRequest(
-                "Channel token not whitelisted".to_string(),
-            ))?
+            .ok_or_else(|| ResponseError::BadRequest("Channel token not whitelisted".to_string()))?
             .with_campaign(campaign);
 
         // If this is an authenticated call
diff --git a/sentry/src/middleware/channel.rs b/sentry/src/middleware/channel.rs
@@ -43,7 +43,7 @@ fn channel_load<C: Locked>(
             .await?
             .ok_or(ResponseError::NotFound)?;
 
-        let channel_context = app.config.find_chain_of(channel.token).ok_or(ResponseError::FailedValidation("Channel token is not whitelisted in this validator".into()))?.with_channel(channel);
+        let channel_context = app.config.find_chain_of(channel.token).ok_or_else(|| ResponseError::FailedValidation("Channel token is not whitelisted in this validator".into()))?.with_channel(channel);
 
         // If this is an authenticated call
         // Check if the Channel context (Chain Id) aligns with the Authentication token Chain id
diff --git a/sentry/src/payout.rs b/sentry/src/payout.rs
@@ -50,7 +50,7 @@ pub fn get_payout(
                         ad_slot_type: ad_unit.map(|u| u.ad_type.clone()).unwrap_or_default(),
                         publisher_id: *publisher,
                         country: session.country.clone(),
-                        event_type: event_type,
+                        event_type,
                         seconds_since_epoch: Utc::now(),
                         user_agent_os: session.os.clone(),
                         user_agent_browser_family: None,
diff --git a/sentry/src/routes/campaign.rs b/sentry/src/routes/campaign.rs
@@ -74,7 +74,7 @@ pub async fn update_latest_spendable<C>(
 where
     C: Locked + 'static,
 {
-    let latest_deposit = adapter.get_deposit(&channel_context, address).await?;
+    let latest_deposit = adapter.get_deposit(channel_context, address).await?;
 
     let spendable = Spendable {
         spender: address,
@@ -255,7 +255,7 @@ where
 
     // Channel insertion can never create a `SqlState::UNIQUE_VIOLATION`
     // Insert the Campaign too
-    match insert_campaign(&app.pool, &campaign).await {
+    match insert_campaign(&app.pool, campaign).await {
         Err(error) => {
             error!(&app.logger, "{}", &error; "module" => "create_campaign");
             match error {
@@ -398,7 +398,7 @@ pub mod update_campaign {
         // *NOTE*: To close a campaign set campaignBudget to campaignSpent so that spendable == 0
 
         let delta_budget = if let Some(new_budget) = modify_campaign.budget {
-            get_delta_budget(campaign_remaining, &campaign, new_budget).await?
+            get_delta_budget(campaign_remaining, campaign, new_budget).await?
         } else {
             None
         };
diff --git a/sentry/src/routes/channel.rs b/sentry/src/routes/channel.rs
@@ -324,7 +324,7 @@ pub async fn add_spender_leaf<C: Locked + 'static>(
     let latest_spendable = match latest_spendable {
         Some(spendable) => spendable,
         None => {
-            create_or_update_spendable_document(&app.adapter, app.pool.clone(), &channel, spender)
+            create_or_update_spendable_document(&app.adapter, app.pool.clone(), channel, spender)
                 .await?
         }
     };
@@ -451,7 +451,7 @@ pub async fn channel_payout<C: Locked + 'static>(
         .map_err(|e| ResponseError::FailedValidation(e.to_string()))?;
 
     // Handling the case where a request with an empty body comes through
-    if to_pay.payouts.len() == 0 {
+    if to_pay.payouts.is_empty() {
         return Err(ResponseError::FailedValidation(
             "Request has empty payouts".to_string(),
         ));
@@ -504,9 +504,11 @@ pub async fn channel_payout<C: Locked + 'static>(
         fetch_spendable(app.pool.clone(), &spender, &channel_context.context.id())
             .await
             .map_err(|err| ResponseError::BadRequest(err.to_string()))?
-            .ok_or(ResponseError::BadRequest(
-                "There is no spendable amount for the spender in this Channel".to_string(),
-            ))?;
+            .ok_or_else(|| {
+                ResponseError::BadRequest(
+                    "There is no spendable amount for the spender in this Channel".to_string(),
+                )
+            })?;
     let total_deposited = latest_spendable.deposit.total;
 
     let available_for_payout = total_deposited
diff --git a/sentry/src/routes/units_for_slot.rs b/sentry/src/routes/units_for_slot.rs
@@ -142,28 +142,22 @@ where
     // WARNING! This will return only the OS type, e.g. `Linux` and not the actual distribution name e.g. `Ubuntu`
     // By contrast `ua-parser-js` will return `Ubuntu` (distribution) and not the OS type `Linux`.
     // `UAParser(...).os.name` (`ua-parser-js: 0.7.22`)
-    let user_agent_os = parsed
-        .as_ref()
-        .map(|p| {
-            if p.os != VALUE_UNKNOWN {
-                Some(p.os.to_string())
-            } else {
-                None
-            }
-        })
-        .flatten();
+    let user_agent_os = parsed.as_ref().and_then(|p| {
+        if p.os != VALUE_UNKNOWN {
+            Some(p.os.to_string())
+        } else {
+            None
+        }
+    });
 
     // Corresponds to `UAParser(...).browser.name` (`ua-parser-js: 0.7.22`)
-    let user_agent_browser_family = parsed
-        .as_ref()
-        .map(|p| {
-            if p.name != VALUE_UNKNOWN {
-                Some(p.name.to_string())
-            } else {
-                None
-            }
-        })
-        .flatten();
+    let user_agent_browser_family = parsed.as_ref().and_then(|p| {
+        if p.name != VALUE_UNKNOWN {
+            Some(p.name.to_string())
+        } else {
+            None
+        }
+    });
 
     let country = request_parts
         .headers
@@ -205,7 +199,7 @@ where
             ad_slot_type: ad_slot.ad_type.clone(),
             publisher_id: publisher_id.to_address(),
             country,
-            event_type: IMPRESSION.into(),
+            event_type: IMPRESSION,
             seconds_since_epoch: Utc::now(),
             user_agent_os,
             user_agent_browser_family: user_agent_browser_family.clone(),
@@ -267,7 +261,7 @@ async fn get_campaigns(
 
     // 2. Check those Campaigns if `Campaign remaining > 0` (in redis)
     let campaigns_remaining = campaign_remaining
-        .get_multiple_with_ids(&active_campaign_ids)
+        .get_multiple_with_ids(active_campaign_ids)
         .await?;
 
     let campaigns_with_remaining = campaigns_remaining
@@ -301,16 +295,15 @@ async fn get_campaigns(
     }))
     .await?
     .into_iter()
-    .filter_map(|accounting| accounting)
+    .flatten()
     .collect::<Vec<_>>();
 
     // 3. Filter `Campaign`s, that include the `publisher_id` in the Channel balances.
     let (mut campaigns_by_earner, rest_of_campaigns): (Vec<Campaign>, Vec<Campaign>) =
         campaigns_with_remaining.into_iter().partition(|campaign| {
             publisher_accountings
                 .iter()
-                .find(|accounting| accounting.channel_id == campaign.channel.id())
-                .is_some()
+                .any(|accounting| accounting.channel_id == campaign.channel.id())
         });
 
     let campaigns = if campaigns_by_earner.len()
diff --git a/test_harness/src/lib.rs b/test_harness/src/lib.rs
@@ -41,11 +41,11 @@ pub static SNAPSHOT_CONTRACTS_1337: Lazy<Contracts> = Lazy::new(|| {
 
     let token = Erc20Token::new(&web3, token_info.clone());
 
-    let sweeper_address = Address::from(ganache_chain_info.chain.sweeper);
+    let sweeper_address = ganache_chain_info.chain.sweeper;
 
     let sweeper = Sweeper::new(&web3, sweeper_address);
 
-    let outpace_address = Address::from(ganache_chain_info.chain.outpace);
+    let outpace_address = ganache_chain_info.chain.outpace;
 
     let outpace = Outpace::new(&web3, outpace_address);
 
@@ -72,11 +72,11 @@ pub static SNAPSHOT_CONTRACTS_1: Lazy<Contracts> = Lazy::new(|| {
 
     let token = Erc20Token::new(&web3, token_info.clone());
 
-    let sweeper_address = Address::from(ganache_chain_info.chain.sweeper);
+    let sweeper_address = ganache_chain_info.chain.sweeper;
 
     let sweeper = Sweeper::new(&web3, sweeper_address);
 
-    let outpace_address = Address::from(ganache_chain_info.chain.outpace);
+    let outpace_address = ganache_chain_info.chain.outpace;
 
     let outpace = Outpace::new(&web3, outpace_address);
 

Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,11 @@ impl<S: BalancesState> Balances<S> {`
`73`	`73`	`self.spenders`
`74`	`74`	`.values()`
`75`	`75`	`.sum::<Option<UnifiedNum>>()`
`76`		`- .map(\|spenders\| {`
	`76`	`+ .and_then(\|spenders\| {`
`77`	`77`	`let earners = self.earners.values().sum::<Option<UnifiedNum>>()?;`
`78`	`78`
`79`	`79`	`Some((earners, spenders))`
`80`	`80`	`})`
`81`		`- .flatten()`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`