models/user: Remove unused sync find() fn

src/auth.rs

@@ -185,7 +185,7 @@
         return Ok(None);
     };
 
-    let user = User::async_find(conn, id).await.map_err(|err| {
+    let user = User::find(conn, id).await.map_err(|err| {
         parts.request_log().add("cause", err);
         internal("user_id from cookie not found in database")
     })?;
@@ -223,7 +223,7 @@
             forbidden("authentication failed")
         })?;
 
-    let user = User::async_find(conn, token.user_id).await.map_err(|err| {
+    let user = User::find(conn, token.user_id).await.map_err(|err| {
         parts.request_log().add("cause", err);
         internal("user_id from token not found in database")
     })?;

src/bin/crates-admin/verify_token.rs

@@ -22,7 +22,7 @@
 
     let token = HashedToken::parse(&opts.api_token)?;
     let token = ApiToken::find_by_api_token(&mut conn, &token).await?;
-    let user = User::async_find(&mut conn, token.user_id).await?;
+    let user = User::find(&mut conn, token.user_id).await?;
     println!("The token belongs to user {}", user.gh_login);
     Ok(())
 }

src/controllers/github/secret_scanning.rs

@@ -183,7 +183,7 @@ async fn send_notification_email(
     state: &AppState,
     conn: &mut AsyncPgConnection,
 ) -> anyhow::Result<()> {
-    let user = User::async_find(conn, token.user_id)
+    let user = User::find(conn, token.user_id)
         .await
         .context("Failed to find user")?;
 

src/models/user.rs

@@ -30,13 +30,7 @@ pub struct User {
 }
 
 impl User {
-    pub fn find(conn: &mut impl Conn, id: i32) -> QueryResult<User> {
-        use diesel::RunQueryDsl;
-
-        users::table.find(id).first(conn)
-    }
-
-    pub async fn async_find(conn: &mut AsyncPgConnection, id: i32) -> QueryResult<User> {
+    pub async fn find(conn: &mut AsyncPgConnection, id: i32) -> QueryResult<User> {
         use diesel_async::RunQueryDsl;
 
         users::table.find(id).first(conn).await

src/tests/user.rs

@@ -37,7 +37,7 @@ async fn updating_existing_user_doesnt_change_api_token() {
     // Use the original API token to find the now updated user
     let hashed_token = assert_ok!(HashedToken::parse(token.expose_secret()));
     let api_token = assert_ok!(ApiToken::find_by_api_token(&mut conn, &hashed_token).await);
-    let user = assert_ok!(User::async_find(&mut conn, api_token.user_id).await);
+    let user = assert_ok!(User::find(&mut conn, api_token.user_id).await);
 
     assert_eq!(user.gh_login, "bar");
     assert_eq!(user.gh_access_token, "bar_token");

src/worker/jobs/expiry_notification.rs

@@ -72,7 +72,7 @@ async fn handle_expiring_token(
     emails: &Emails,
 ) -> Result<(), anyhow::Error> {
     debug!("Looking up user {} for token {}…", token.user_id, token.id);
-    let user = User::async_find(conn, token.user_id).await?;
+    let user = User::find(conn, token.user_id).await?;
 
     debug!("Looking up email address for user {}…", user.id);
     let recipient = user.async_email(conn).await?;