Resolve bad merge, run cargo fmt

Author: kailan

src/controllers/user/email_verification.rs

@@ -74,13 +74,6 @@ pub async fn resend_email_verification(
     // Generate a new token for the email, if it exists and is unverified
     conn.transaction(|conn| {
         async move {
-            let email: Email = diesel::update(Email::belonging_to(auth.user()))
-                .set(emails::token.eq(sql("DEFAULT")))
-                .returning(Email::as_returning())
-                .get_result(conn)
-                .await
-                .optional()?
-                .ok_or_else(|| bad_request("Email could not be found"))?;
             let email: Email = diesel::update(
                 emails::table
                     .filter(emails::id.eq(email_id))

src/controllers/user/emails.rs

@@ -3,7 +3,7 @@ use crate::auth::AuthCheck;
 use crate::controllers::helpers::OkResponse;
 use crate::email::EmailMessage;
 use crate::models::{Email, NewEmail};
-use crate::util::errors::{bad_request, not_found, server_error, AppResult};
+use crate::util::errors::{AppResult, bad_request, not_found, server_error};
 use crate::views::EncodableEmail;
 use axum::Json;
 use axum::extract::{FromRequest, Path};

src/tests/routes/users/emails.rs

@@ -14,11 +14,7 @@ pub trait MockEmailHelper: RequestHelper {
         self.delete(&url).await
     }
 
-    async fn enable_notifications(
-        &self,
-        user_id: i32,
-        email_id: i32,
-    ) -> Response<()> {
+    async fn enable_notifications(&self, user_id: i32, email_id: i32) -> Response<()> {
         let url = format!("/api/v1/users/{user_id}/emails/{email_id}/notifications");
         self.put(&url, "").await
     }
@@ -214,15 +210,11 @@ async fn test_other_users_cannot_enable_my_notifications() {
     let another_user = app.db_new_user("not_me").await;
     let another_user_model = another_user.as_model();
 
-    let response = user
-        .enable_notifications(another_user_model.id, 1)
-        .await;
+    let response = user.enable_notifications(another_user_model.id, 1).await;
     assert_snapshot!(response.status(), @"400 Bad Request");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"current user does not match requested user"}]}"#);
 
-    let response = anon
-        .enable_notifications(another_user_model.id, 1)
-        .await;
+    let response = anon.enable_notifications(another_user_model.id, 1).await;
     assert_snapshot!(response.status(), @"403 Forbidden");
     assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"this action requires authentication"}]}"#);
 }

src/tests/util.rs

@@ -317,7 +317,12 @@ impl MockCookieUser {
     }
 
     /// Creates an email for the user, directly inserting it into the database
-    pub async fn db_new_email(&self, email: &str, verified: bool, send_notifications: bool) -> crate::models::Email {
+    pub async fn db_new_email(
+        &self,
+        email: &str,
+        verified: bool,
+        send_notifications: bool,
+    ) -> crate::models::Email {
         let mut conn = self.app.db_conn().await;
         let new_email = crate::models::NewEmail::builder()
             .user_id(self.user.id)

src/views.rs

@@ -700,13 +700,17 @@ pub struct EncodablePrivateUser {
     /// Whether the user's has been sent a verification email to their notification email address, if set.
     #[schema(example = true)]
     #[serde(rename = "email_verification_sent")]
-    #[deprecated(note = "Use `emails` array instead, check that `token_generated_at` property is not null.")]
+    #[deprecated(
+        note = "Use `emails` array instead, check that `token_generated_at` property is not null."
+    )]
     pub notification_email_verification_sent: bool,
 
     /// The user's email address for sending notifications, if set.
     #[schema(example = "[email protected]")]
     #[serde(rename = "email")]
-    #[deprecated(note = "Use `emails` array instead, maximum of one entry will have `send_notifications` property set to true.")]
+    #[deprecated(
+        note = "Use `emails` array instead, maximum of one entry will have `send_notifications` property set to true."
+    )]
     pub notification_email: Option<String>,
 
     /// The user's avatar URL, if set.