From 230b4a6ba9a9a9397ee944748f92386a244bd8d1 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Thu, 23 Feb 2023 01:52:50 +0100
Subject: [PATCH] Remove usage of mem::take

---
 src/mailer.rs |  5 ++---
 src/routes.rs | 15 +++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/mailer.rs b/src/mailer.rs
index 2010971..8b43685 100644
--- a/src/mailer.rs
+++ b/src/mailer.rs
@@ -4,7 +4,6 @@ use lettre::message::{Mailbox, MessageBuilder};
 use lettre::transport::smtp::authentication::Credentials;
 use lettre::Transport;
 use lettre::{Message, SmtpTransport};
-use std::mem;
 
 use crate::config;
 
@@ -16,8 +15,8 @@ pub struct Mailer {
 impl Mailer {
     pub fn new(config: &mut config::Config) -> Result<Self> {
         let creds = Credentials::new(
-            mem::take(&mut config.email_server.email),
-            mem::take(&mut config.email_server.password),
+            config.email_server.email.clone(),
+            config.email_server.password.clone(),
         );
 
         let mailer = SmtpTransport::relay(&config.email_server.server_name)
diff --git a/src/routes.rs b/src/routes.rs
index 9838729..a8358b9 100644
--- a/src/routes.rs
+++ b/src/routes.rs
@@ -2,7 +2,6 @@ use anyhow::{Context, Result};
 use askama_axum::IntoResponse;
 use axum::extract::{Form, State};
 use axum::response::Response;
-use std::mem;
 use std::sync::Arc;
 use tracing::{error, info};
 
@@ -69,21 +68,17 @@ async fn failed_submission(
     config: Arc<config::Config>,
     captcha_solutions: Arc<captcha_solutions::SharedCaptchaSolutions>,
     error_message: &str,
-    mut form: forms::ContactForm,
+    form: forms::ContactForm,
 ) -> Result<Response, errors::AppError> {
-    let name = mem::take(&mut form.name);
-    let email = mem::take(&mut form.email);
-    let telefon = mem::take(&mut form.telefon);
-    let message = mem::take(&mut form.message);
 
     let params = IndexParams {
         config,
         captcha_solutions,
         was_validated: true,
-        name: Some(name),
-        email: Some(email),
-        telefon: Some(telefon),
-        message: Some(message),
+        name: Some(form.name),
+        email: Some(form.email),
+        telefon: Some(form.telefon),
+        message: Some(form.message),
         error_message: Some(error_message),
     };