fix: address clippy warnings

squamishaccess · May 4, 2022 · 1c5cb02 · 1c5cb02
1 parent 3f91ebd
commit 1c5cb02
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/src/azure_function/logger.rs b/src/azure_function/logger.rs
@@ -51,14 +51,14 @@ impl LogMiddleware {
                 logger.log(format!("Internal error. message: {:?}, error_type: {:?}, status: {}, duration: {:?}",
                     error,
                     error.type_name(),
-                    format!("{} - {}", status as u16, status.canonical_reason()),
+                    format_args!("{} - {}", status as u16, status.canonical_reason()),
                     start.elapsed(),
                 )).await;
             } else {
                 logger
                     .log(format!(
                         "Internal error. status: {}, duration: {:?}",
-                        format!("{} - {}", status as u16, status.canonical_reason()),
+                        format_args!("{} - {}", status as u16, status.canonical_reason()),
                         start.elapsed(),
                     ))
                     .await;
@@ -70,15 +70,15 @@ impl LogMiddleware {
                         "Client error. message: {:?}, error_type: {:?}, status: {}, duration: {:?}",
                         error,
                         error.type_name(),
-                        format!("{} - {}", status as u16, status.canonical_reason()),
+                        format_args!("{} - {}", status as u16, status.canonical_reason()),
                         start.elapsed(),
                     ))
                     .await;
             } else {
                 logger
                     .log(format!(
                         "Client error. status: {}, duration: {:?}",
-                        format!("{} - {}", status as u16, status.canonical_reason()),
+                        format_args!("{} - {}", status as u16, status.canonical_reason()),
                         start.elapsed(),
                     ))
                     .await;

diff --git a/src/ipn_handler.rs b/src/ipn_handler.rs
@@ -119,21 +119,19 @@ pub async fn ipn_handler(mut req: AppRequest) -> tide::Result<Response> {
     }
 
     // Attempt to deserialize the IPN message.
-    let ipn_transaction_message: IPNTransationMessage;
-    match serde_qs::from_str(&ipn_transaction_message_raw) {
-        Ok(msg) => {
-            ipn_transaction_message = msg;
-        }
-        Err(error) => {
-            return Err(tide::Error::from_str(
-                StatusCode::InternalServerError,
-                format!(
-                    "(Full IPN Details) Invalid IPN: unparseable IPN: \"{}\" - error: {:?}",
-                    ipn_transaction_message_raw, error
-                ),
-            ));
-        }
-    }
+    let ipn_transaction_message: IPNTransationMessage =
+        match serde_qs::from_str(&ipn_transaction_message_raw) {
+            Ok(msg) => msg,
+            Err(error) => {
+                return Err(tide::Error::from_str(
+                    StatusCode::InternalServerError,
+                    format!(
+                        "(Full IPN Details) Invalid IPN: unparseable IPN: \"{}\" - error: {:?}",
+                        ipn_transaction_message_raw, error
+                    ),
+                ));
+            }
+        };
 
     if let Some(payment_date) = ipn_transaction_message.payment_date {
         info!(logger, "Payment Timestamp: {}", payment_date);

diff --git a/src/main.rs b/src/main.rs
@@ -61,12 +61,11 @@ async fn main() -> Result<()> {
 
     // PayPal
     let paypal_sandbox = env::var("PAYPAL_SANDBOX").is_ok();
-    let paypal_base_url;
-    if paypal_sandbox {
+    let paypal_base_url = if paypal_sandbox {
         warn!("SANDBOX: Using PayPal sandbox environment");
-        paypal_base_url = Url::parse("https://ipnpb.sandbox.paypal.com/")?;
+        Url::parse("https://ipnpb.sandbox.paypal.com/")?
     } else {
-        paypal_base_url = Url::parse("https://ipnpb.paypal.com/")?;
+        Url::parse("https://ipnpb.paypal.com/")?
     };
 
     // Set up re-useable api clients for efficiency & ergonomics.