controllers/helpers/pagination: Remove sync load() fns

Author: Turbo87

src/controllers/helpers/pagination.rs

@@ -11,7 +11,6 @@ use crate::util::diesel::prelude::*;
 use base64::{engine::general_purpose, Engine};
 use diesel::pg::Pg;
 use diesel::query_builder::{AstPass, Query, QueryFragment, QueryId};
-use diesel::query_dsl::LoadQuery;
 use diesel::sql_types::BigInt;
 use diesel_async::AsyncPgConnection;
 use futures_util::future::BoxFuture;
@@ -253,19 +252,7 @@ pub(crate) struct PaginatedQuery<T> {
 }
 
 impl<T> PaginatedQuery<T> {
-    pub(crate) fn load<'a, U, Conn>(self, conn: &mut Conn) -> QueryResult<Paginated<U>>
-    where
-        Self: LoadQuery<'a, Conn, WithCount<U>>,
-    {
-        let options = self.options.clone();
-        let records_and_total = self.internal_load(conn)?.collect::<QueryResult<_>>()?;
-        Ok(Paginated {
-            records_and_total,
-            options,
-        })
-    }
-
-    pub fn async_load<'a, U>(
+    pub fn load<'a, U>(
         self,
         conn: &'a mut AsyncPgConnection,
     ) -> BoxFuture<'a, QueryResult<Paginated<U>>>
@@ -418,19 +405,7 @@ where
 }
 
 impl<T, C> PaginatedQueryWithCountSubq<T, C> {
-    pub(crate) fn load<'a, U, Conn>(self, conn: &mut Conn) -> QueryResult<Paginated<U>>
-    where
-        Self: LoadQuery<'a, Conn, WithCount<U>>,
-    {
-        let options = self.options.clone();
-        let records_and_total = self.internal_load(conn)?.collect::<QueryResult<_>>()?;
-        Ok(Paginated {
-            records_and_total,
-            options,
-        })
-    }
-
-    pub fn async_load<'a, U>(
+    pub fn load<'a, U>(
         self,
         conn: &'a mut AsyncPgConnection,
     ) -> BoxFuture<'a, QueryResult<Paginated<U>>>

src/controllers/keyword.rs

@@ -29,7 +29,7 @@ pub async fn index(state: AppState, qp: Query<IndexQuery>, req: Parts) -> AppRes
     let query = query.pages_pagination(PaginationOptions::builder().gather(&req)?);
 
     let mut conn = state.db_read().await?;
-    let data: Paginated<Keyword> = query.async_load(&mut conn).await?;
+    let data: Paginated<Keyword> = query.load(&mut conn).await?;
     let total = data.total();
     let kws = data
         .into_iter()

src/controllers/krate/search.rs

@@ -195,7 +195,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<ErasedJson> {
         let count_query = filter_params.make_query(&req, conn).await?.count();
         let query = query.pages_pagination_with_count_query(pagination, count_query);
         let span = info_span!("db.query", message = "SELECT ..., COUNT(*) FROM crates");
-        let data = query.async_load::<Record>(conn).instrument(span).await?;
+        let data = query.load::<Record>(conn).instrument(span).await?;
         (
             data.total(),
             data.next_seek_params(|last| seek.to_payload(last))?
@@ -208,7 +208,7 @@ pub async fn search(app: AppState, req: Parts) -> AppResult<ErasedJson> {
         let count_query = filter_params.make_query(&req, conn).await?.count();
         let query = query.pages_pagination_with_count_query(pagination, count_query);
         let span = info_span!("db.query", message = "SELECT ..., COUNT(*) FROM crates");
-        let data = query.async_load::<Record>(conn).instrument(span).await?;
+        let data = query.load::<Record>(conn).instrument(span).await?;
         (
             data.total(),
             data.next_page_params().map(|p| req.query_with_params(p)),

src/controllers/user/me.rs

@@ -79,7 +79,7 @@ pub async fn updates(app: AppState, req: Parts) -> AppResult<ErasedJson> {
         .select(<(Version, CrateName, Option<User>)>::as_select())
         .pages_pagination(PaginationOptions::builder().gather(&req)?);
 
-    let data: Paginated<(Version, CrateName, Option<User>)> = query.async_load(&mut conn).await?;
+    let data: Paginated<(Version, CrateName, Option<User>)> = query.load(&mut conn).await?;
 
     let more = data.next_page_params().is_some();
     let versions = data.iter().map(|(v, ..)| v).collect::<Vec<_>>();