Skip to content

Commit 8e099ed

Browse files
committed
Cargo fmt
1 parent 4434413 commit 8e099ed

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/controllers/category.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ pub fn index(req: &mut dyn Request) -> CargoResult<Response> {
3737
pub fn show(req: &mut dyn Request) -> CargoResult<Response> {
3838
let slug = &req.params()["category_id"];
3939
let conn = req.db_conn()?;
40-
let cat = Category::by_slug(slug)
41-
.first::<Category>(&*conn)?;
40+
let cat = Category::by_slug(slug).first::<Category>(&*conn)?;
4241
let subcats = cat
4342
.subcategories(&conn)?
4443
.into_iter()
4544
.map(Category::encodable)
4645
.collect();
47-
let parents = cat.parent_categories(&conn)?
46+
let parents = cat
47+
.parent_categories(&conn)?
4848
.into_iter()
4949
.map(Category::encodable)
5050
.collect();

src/models/category.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use chrono::NaiveDateTime;
2-
use diesel::{*, self};
2+
use diesel::{self, *};
33

44
use models::Crate;
55
use schema::*;
@@ -44,9 +44,9 @@ type WithSlugsCaseSensitive<'a> = diesel::dsl::Eq<
4444
diesel::pg::expression::array_comparison::Any<
4545
diesel::expression::bound::Bound<
4646
diesel::sql_types::Array<diesel::sql_types::Text>,
47-
&'a [&'a str]
48-
>
49-
>
47+
&'a [&'a str],
48+
>,
49+
>,
5050
>;
5151
type BySlugsCaseSensitive<'a> = diesel::dsl::Filter<All, WithSlugsCaseSensitive<'a>>;
5252

@@ -106,10 +106,8 @@ impl Category {
106106
krate: &Crate,
107107
slugs: &[&'a str],
108108
) -> QueryResult<Vec<&'a str>> {
109-
110109
conn.transaction(|| {
111-
let categories = Category::by_slugs_case_sensitive(slugs)
112-
.load::<Category>(conn)?;
110+
let categories = Category::by_slugs_case_sensitive(slugs).load::<Category>(conn)?;
113111
let invalid_categories = slugs
114112
.iter()
115113
.cloned()

0 commit comments

Comments
 (0)