models/user: Inline new() fn

Author: Turbo87

src/controllers/session.rs

@@ -140,13 +140,13 @@ async fn save_user_to_database(
     emails: &Emails,
     conn: &mut AsyncPgConnection,
 ) -> AppResult<User> {
-    let new_user = NewUser::new(
-        user.id,
-        &user.login,
-        user.name.as_deref(),
-        user.avatar_url.as_deref(),
-        access_token,
-    );
+    let new_user = NewUser::builder()
+        .gh_id(user.id)
+        .gh_login(&user.login)
+        .maybe_name(user.name.as_deref())
+        .maybe_gh_avatar(user.avatar_url.as_deref())
+        .gh_access_token(access_token)
+        .build();
 
     match new_user
         .create_or_update(user.email.as_deref(), emails, conn)

src/models/user.rs

@@ -118,22 +118,6 @@ pub struct NewUser<'a> {
 }
 
 impl<'a> NewUser<'a> {
-    pub fn new(
-        gh_id: i32,
-        gh_login: &'a str,
-        name: Option<&'a str>,
-        gh_avatar: Option<&'a str>,
-        gh_access_token: &'a str,
-    ) -> Self {
-        NewUser::builder()
-            .gh_id(gh_id)
-            .gh_login(gh_login)
-            .maybe_name(name)
-            .maybe_gh_avatar(gh_avatar)
-            .gh_access_token(gh_access_token)
-            .build()
-    }
-
     /// Inserts the user into the database, or updates an existing one.
     pub async fn create_or_update(
         &self,

src/tests/routes/users/read.rs

@@ -35,21 +35,19 @@ async fn show_latest_user_case_insensitively() {
     // crates.io/user/{username} pages, the best we can do is show the last crates.io account
     // created with that username.
 
-    let user1 = NewUser::new(
-        1,
-        "foobar",
-        Some("I was first then deleted my github account"),
-        None,
-        "bar",
-    );
+    let user1 = NewUser::builder()
+        .gh_id(1)
+        .gh_login("foobar")
+        .name("I was first then deleted my github account")
+        .gh_access_token("bar")
+        .build();
 
-    let user2 = NewUser::new(
-        2,
-        "FOOBAR",
-        Some("I was second, I took the foobar username on github"),
-        None,
-        "bar",
-    );
+    let user2 = NewUser::builder()
+        .gh_id(2)
+        .gh_login("FOOBAR")
+        .name("I was second, I took the foobar username on github")
+        .gh_access_token("bar")
+        .build();
 
     assert_ok!(
         diesel::insert_into(users::table)

src/tests/user.rs

@@ -26,7 +26,11 @@ async fn updating_existing_user_doesnt_change_api_token() -> anyhow::Result<()>
 
     // Reuse gh_id but use new gh_login and gh_access_token
     assert_ok!(
-        NewUser::new(gh_id, "bar", None, None, "bar_token")
+        NewUser::builder()
+            .gh_id(gh_id)
+            .gh_login("bar")
+            .gh_access_token("bar_token")
+            .build()
             .create_or_update(None, &app.as_inner().emails, &mut conn)
             .await
     );

src/typosquat/test_util.rs

@@ -40,7 +40,11 @@ pub mod faker {
     }
 
     pub async fn user(conn: &mut AsyncPgConnection, login: &str) -> QueryResult<User> {
-        let user = NewUser::new(next_gh_id(), login, None, None, "token");
+        let user = NewUser::builder()
+            .gh_id(next_gh_id())
+            .gh_login(login)
+            .gh_access_token("token")
+            .build();
 
         diesel::insert_into(users::table)
             .values(user)

src/worker/jobs/downloads/update_metadata.rs

@@ -111,7 +111,12 @@ mod tests {
     use diesel_async::AsyncConnection;
 
     async fn user(conn: &mut AsyncPgConnection) -> User {
-        let user = NewUser::new(2, "login", None, None, "access_token");
+        let user = NewUser::builder()
+            .gh_id(2)
+            .gh_login("login")
+            .gh_access_token("access_token")
+            .build();
+
         diesel::insert_into(users::table)
             .values(user)
             .get_result(conn)

src/worker/jobs/expiry_notification.rs

@@ -178,7 +178,11 @@ mod tests {
         let mut conn = test_db.async_connect().await;
 
         // Set up a user and a token that is about to expire.
-        let user = NewUser::new(0, "a", None, None, "token");
+        let user = NewUser::builder()
+            .gh_id(0)
+            .gh_login("a")
+            .gh_access_token("token")
+            .build();
         let emails = Emails::new_in_memory();
         let user = user
             .create_or_update(Some("testuser@test.com"), &emails, &mut conn)