cargo fmt

Author: jtgeibel

src/category.rs

@@ -201,7 +201,7 @@ impl Category {
             "\
             SELECT COUNT(*) \
             FROM categories \
-            WHERE category NOT LIKE '%::%'"
+            WHERE category NOT LIKE '%::%'",
         );
         let count = query.get_result(&*conn)?;
         Ok(count)
@@ -328,7 +328,6 @@ impl<'a> NewCategory<'a> {
             .get_result(conn)
             .map_err(Into::into)
     }
-
 }
 
 impl Model for Category {
@@ -383,9 +382,10 @@ pub fn show(req: &mut Request) -> CargoResult<Response> {
     let id = &req.params()["category_id"];
     let conn = req.db_conn()?;
     let cat = categories.filter(slug.eq(id)).first::<Category>(&*conn)?;
-    let subcats = cat.subcategories(&*conn)?.into_iter().map(|s| {
-        s.encodable()
-    }).collect();
+    let subcats = cat.subcategories(&*conn)?
+        .into_iter()
+        .map(|s| s.encodable())
+        .collect();
 
     let cat = cat.encodable();
     let cat_with_subcats = EncodableCategoryWithSubcategories {

src/tests/category.rs

@@ -35,8 +35,12 @@ fn index() {
     // Create a category and a subcategory
     {
         let conn = t!(app.diesel_database.get());
-        ::new_category("foo", "foo").create_or_update(&conn).unwrap();
-        ::new_category("foo::bar", "foo::bar").create_or_update(&conn).unwrap();
+        ::new_category("foo", "foo")
+            .create_or_update(&conn)
+            .unwrap();
+        ::new_category("foo::bar", "foo::bar")
+            .create_or_update(&conn)
+            .unwrap();
     }
     let mut response = ok_resp!(middle.call(&mut req));
     let json: CategoryList = ::json(&mut response);
@@ -89,7 +93,11 @@ fn update_crate() {
         let user = t!(::new_user("foo").create_or_update(&conn));
         t!(::new_category("cat1", "cat1").create_or_update(&conn));
         t!(::new_category("Category 2", "category-2").create_or_update(&conn));
-        t!(::new_crate("foo_crate").create_or_update(&conn, None, user.id))
+        t!(::new_crate("foo_crate").create_or_update(
+            &conn,
+            None,
+            user.id,
+        ))
     };
 
     // Updating with no categories has no effect
@@ -127,11 +135,7 @@ fn update_crate() {
     // Adding 2 categories
     {
         let conn = t!(app.diesel_database.get());
-        Category::update_crate(
-            &conn,
-            &krate,
-            &["cat1", "category-2"],
-        ).unwrap();
+        Category::update_crate(&conn, &krate, &["cat1", "category-2"]).unwrap();
     }
     assert_eq!(cnt(&mut req, "cat1"), 1);
     assert_eq!(cnt(&mut req, "category-2"), 1);
@@ -147,11 +151,7 @@ fn update_crate() {
     // Attempting to add one valid category and one invalid category
     let invalid_categories = {
         let conn = t!(app.diesel_database.get());
-        Category::update_crate(
-            &conn,
-            &krate,
-            &["cat1", "catnope"],
-        ).unwrap()
+        Category::update_crate(&conn, &krate, &["cat1", "catnope"]).unwrap()
     };
     assert_eq!(invalid_categories, vec!["catnope".to_string()]);
     assert_eq!(cnt(&mut req, "cat1"), 1);
@@ -176,12 +176,10 @@ fn update_crate() {
     // Add a category and its subcategory
     {
         let conn = t!(app.diesel_database.get());
-        t!(::new_category("cat1::bar", "cat1::bar").create_or_update(&conn));
-        Category::update_crate(
+        t!(::new_category("cat1::bar", "cat1::bar").create_or_update(
             &conn,
-            &krate,
-            &["cat1", "cat1::bar"],
-        ).unwrap();
+        ));
+        Category::update_crate(&conn, &krate, &["cat1", "cat1::bar"]).unwrap();
     }
     assert_eq!(cnt(&mut req, "cat1"), 1);
     assert_eq!(cnt(&mut req, "cat1::bar"), 1);

src/tests/krate.rs

@@ -1714,7 +1714,8 @@ fn author_license_and_description_required() {
     req.with_body(&::new_crate_to_body(&new_crate, &[]));
     let json = bad_resp!(middle.call(&mut req));
     assert!(
-        !json.errors[0].detail.contains("author") && json.errors[0].detail.contains("description") &&
+        !json.errors[0].detail.contains("author") &&
+            json.errors[0].detail.contains("description") &&
             !json.errors[0].detail.contains("license"),
         "{:?}",
         json.errors