rustfmt

Author: sgrif

src/controllers/helpers/pagination.rs

@@ -1,11 +1,11 @@
+use crate::models::helpers::with_count::*;
+use crate::util::errors::*;
 use diesel::pg::Pg;
 use diesel::prelude::*;
 use diesel::query_builder::*;
-use diesel::sql_types::BigInt;
 use diesel::query_dsl::LoadQuery;
+use diesel::sql_types::BigInt;
 use indexmap::IndexMap;
-use crate::util::errors::*;
-use crate::models::helpers::with_count::*;
 
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum Page {
@@ -87,10 +87,12 @@ pub struct Paginated<T> {
 
 impl<T> Paginated<T> {
     pub(crate) fn total(&self) -> Option<i64> {
-        Some(self.records_and_total
-            .get(0)
-            .map(|row| row.total)
-            .unwrap_or_default())
+        Some(
+            self.records_and_total
+                .get(0)
+                .map(|row| row.total)
+                .unwrap_or_default(),
+        )
     }
 
     pub(crate) fn next_page_params(&self) -> Option<IndexMap<String, String>> {
@@ -120,9 +122,7 @@ impl<T> Paginated<T> {
     }
 
     pub(crate) fn iter(&self) -> impl Iterator<Item = &T> {
-        self.records_and_total
-            .iter()
-            .map(|row| &row.record)
+        self.records_and_total.iter().map(|row| &row.record)
     }
 }
 

src/controllers/keyword.rs

@@ -20,14 +20,9 @@ pub fn index(req: &mut dyn Request) -> CargoResult<Response> {
         query = query.order(keywords::keyword.asc());
     }
 
-    let data = query
-        .paginate(&req.query())?
-        .load::<Keyword>(&*conn)?;
+    let data = query.paginate(&req.query())?.load::<Keyword>(&*conn)?;
     let total = data.total();
-    let kws = data
-        .into_iter()
-        .map(Keyword::encodable)
-        .collect::<Vec<_>>();
+    let kws = data.into_iter().map(Keyword::encodable).collect::<Vec<_>>();
 
     #[derive(Serialize)]
     struct R {

src/controllers/user/me.rs

@@ -70,9 +70,7 @@ pub fn updates(req: &mut dyn Request) -> CargoResult<Response> {
 
     let versions = data
         .into_iter()
-        .map(|(version, crate_name, published_by)| {
-            version.encodable(&crate_name, published_by)
-        })
+        .map(|(version, crate_name, published_by)| version.encodable(&crate_name, published_by))
         .collect();
 
     #[derive(Serialize)]

src/models/krate.rs

@@ -3,8 +3,8 @@ use diesel::associations::Identifiable;
 use diesel::pg::Pg;
 use diesel::prelude::*;
 use diesel::sql_types::Bool;
-use url::Url;
 use indexmap::IndexMap;
+use url::Url;
 
 use crate::app::App;
 use crate::util::{human, CargoResult};
@@ -525,9 +525,9 @@ impl Crate {
         conn: &PgConnection,
         params: &IndexMap<String, String>,
     ) -> CargoResult<(Vec<ReverseDependency>, i64)> {
+        use crate::controllers::helpers::pagination::*;
         use diesel::sql_query;
         use diesel::sql_types::{BigInt, Integer};
-        use crate::controllers::helpers::pagination::*;
 
         // FIXME: It'd be great to support this with `.paginate` directly,
         // and get cursor/id pagination for free. But Diesel doesn't currently