Skip to content

Commit e02838e

Browse files
authored
chore: address Rust 1.73 clippy lints (#2474)
1 parent 224b83c commit e02838e

File tree

10 files changed

+31
-26
lines changed

10 files changed

+31
-26
lines changed

crates/router/src/connector/checkout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl ConnectorCommon for Checkout {
110110
};
111111

112112
router_env::logger::info!(error_response=?response);
113-
let errors_list = response.error_codes.clone().unwrap_or(vec![]);
113+
let errors_list = response.error_codes.clone().unwrap_or_default();
114114
let option_error_code_message = conn_utils::get_error_code_error_message_based_on_priority(
115115
self.clone(),
116116
errors_list

crates/router/src/connector/cybersource.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl ConnectorCommon for Cybersource {
101101
.response
102102
.parse_struct("Cybersource ErrorResponse")
103103
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
104-
let details = response.details.unwrap_or(vec![]);
104+
let details = response.details.unwrap_or_default();
105105
let connector_reason = details
106106
.iter()
107107
.map(|det| format!("{} : {}", det.field, det.reason))

crates/router/src/connector/paypal.rs

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub mod transformers;
2-
use std::fmt::Debug;
2+
use std::fmt::{Debug, Write};
33

44
use base64::Engine;
55
use common_utils::ext_traits::ByteSliceExt;
@@ -169,12 +169,26 @@ impl ConnectorCommon for Paypal {
169169
.parse_struct("Paypal ErrorResponse")
170170
.change_context(errors::ConnectorError::ResponseDeserializationFailed)?;
171171

172-
let error_reason = response.details.map(|error_details| {
173-
error_details
174-
.iter()
175-
.map(|error| format!("description - {} ; ", error.description))
176-
.collect::<String>()
177-
});
172+
let error_reason = response
173+
.details
174+
.map(|error_details| {
175+
error_details
176+
.iter()
177+
.try_fold::<_, _, CustomResult<_, errors::ConnectorError>>(
178+
String::new(),
179+
|mut acc, error| {
180+
write!(acc, "description - {} ;", error.description)
181+
.into_report()
182+
.change_context(
183+
errors::ConnectorError::ResponseDeserializationFailed,
184+
)
185+
.attach_printable("Failed to concatenate error details")
186+
.map(|_| acc)
187+
},
188+
)
189+
})
190+
.transpose()?;
191+
178192
Ok(ErrorResponse {
179193
status_code: res.status_code,
180194
code: response.name,

crates/router/src/connector/paypal/transformers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,7 @@ fn get_headers(
16551655
key: &'static str,
16561656
) -> CustomResult<String, errors::ConnectorError> {
16571657
let header_value = header
1658-
.get(key.clone())
1658+
.get(key)
16591659
.map(|value| value.to_str())
16601660
.ok_or(errors::ConnectorError::MissingRequiredField { field_name: key })?
16611661
.into_report()

crates/router/src/core/payment_methods/cards.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -977,9 +977,7 @@ pub async fn list_payment_methods(
977977
.0
978978
.get(&payment_method_type)
979979
.map(|required_fields_hm_for_each_connector| {
980-
required_fields_hm
981-
.entry(payment_method)
982-
.or_insert(HashMap::new());
980+
required_fields_hm.entry(payment_method).or_default();
983981
required_fields_hm_for_each_connector
984982
.fields
985983
.get(&connector_variant)

crates/router/src/core/payments/customers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub async fn update_connector_customer_in_customers(
121121
.and_then(|customer| customer.connector_customer.as_ref())
122122
.and_then(|connector_customer| connector_customer.as_object())
123123
.map(ToOwned::to_owned)
124-
.unwrap_or(serde_json::Map::new());
124+
.unwrap_or_default();
125125

126126
let updated_connector_customer_map =
127127
connector_customer_id.as_ref().map(|connector_customer_id| {

crates/router/src/core/payments/transformers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ where
423423
status_code.to_string(),
424424
)]
425425
})
426-
.unwrap_or(vec![]);
426+
.unwrap_or_default();
427427
if let Some(payment_confirm_source) = payment_intent.payment_confirm_source {
428428
headers.push((
429429
"payment_confirm_source".to_string(),

crates/router/src/core/payouts.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,10 +1205,7 @@ pub async fn payout_create_db_entries(
12051205
.set_recurring(req.recurring.unwrap_or(false))
12061206
.set_auto_fulfill(req.auto_fulfill.unwrap_or(false))
12071207
.set_return_url(req.return_url.to_owned())
1208-
.set_entity_type(
1209-
req.entity_type
1210-
.unwrap_or(api_enums::PayoutEntityType::default()),
1211-
)
1208+
.set_entity_type(req.entity_type.unwrap_or_default())
12121209
.set_metadata(req.metadata.to_owned())
12131210
.set_created_at(Some(common_utils::date_time::now()))
12141211
.set_last_modified_at(Some(common_utils::date_time::now()))

crates/router/src/services/api.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,9 @@ pub async fn send_request(
472472
match request.content_type {
473473
Some(ContentType::Json) => client.json(&request.payload),
474474

475-
Some(ContentType::FormData) => client.multipart(
476-
request
477-
.form_data
478-
.unwrap_or_else(reqwest::multipart::Form::new),
479-
),
475+
Some(ContentType::FormData) => {
476+
client.multipart(request.form_data.unwrap_or_default())
477+
}
480478

481479
// Currently this is not used remove this if not required
482480
// If using this then handle the serde_part

crates/router/src/types/transformers.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ impl ForeignTryFrom<api_models::webhooks::IncomingWebhookEvent> for storage_enum
453453

454454
impl ForeignFrom<storage::Config> for api_types::Config {
455455
fn foreign_from(config: storage::Config) -> Self {
456-
let config = config;
457456
Self {
458457
key: config.key,
459458
value: config.config,
@@ -472,7 +471,6 @@ impl<'a> ForeignFrom<&'a api_types::ConfigUpdate> for storage::ConfigUpdate {
472471

473472
impl<'a> From<&'a domain::Address> for api_types::Address {
474473
fn from(address: &domain::Address) -> Self {
475-
let address = address;
476474
Self {
477475
address: Some(api_types::AddressDetails {
478476
city: address.city.clone(),

0 commit comments

Comments
 (0)