Skip to content

Commit 7dec3d1

Browse files
committed
cargo fmt
1 parent ea22c61 commit 7dec3d1

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

src/tests/user.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,30 +234,33 @@ fn user_total_downloads() {
234234

235235
u = ::new_user("foo").create_or_update(&conn).unwrap();
236236

237-
let mut krate = ::CrateBuilder::new("foo_krate1", u.id)
238-
.expect_build(&conn);
237+
let mut krate = ::CrateBuilder::new("foo_krate1", u.id).expect_build(&conn);
239238
krate.downloads = 10;
240239
update(&krate).set(&krate).execute(&*conn).unwrap();
241240

242-
let mut krate2 = ::CrateBuilder::new("foo_krate2", u.id)
243-
.expect_build(&conn);
241+
let mut krate2 = ::CrateBuilder::new("foo_krate2", u.id).expect_build(&conn);
244242
krate2.downloads = 20;
245243
update(&krate2).set(&krate2).execute(&*conn).unwrap();
246244

247245
let another_user = ::new_user("bar").create_or_update(&conn).unwrap();
248246

249247
let mut another_krate = ::CrateBuilder::new("bar_krate1", another_user.id)
250-
.expect_build(&conn);
248+
.expect_build(&conn);
251249
another_krate.downloads = 2;
252-
update(&another_krate).set(&another_krate).execute(&*conn).unwrap();
250+
update(&another_krate)
251+
.set(&another_krate)
252+
.execute(&*conn)
253+
.unwrap();
253254
}
254255

255256
let mut req = ::req(app, Method::Get, &format!("/api/v1/users/{}/stats", u.id));
256257
let mut response = ok_resp!(middle.call(&mut req));
257258

258259
#[derive(RustcDecodable)]
259-
struct Response { total_downloads: i64 }
260+
struct Response {
261+
total_downloads: i64,
262+
}
260263
let response: Response = ::json(&mut response);
261264
assert_eq!(response.total_downloads, 30);
262265
assert!(response.total_downloads != 32);
263-
}
266+
}

src/user/mod.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -453,19 +453,23 @@ pub fn updates(req: &mut Request) -> CargoResult<Response> {
453453

454454
/// Handles the `GET /users/:user_id/stats` route.
455455
pub fn stats(req: &mut Request) -> CargoResult<Response> {
456-
use diesel::expression::dsl::sum;
456+
use diesel::expression::dsl::sum;
457457
use owner::OwnerKind;
458458

459459
let user_id = &req.params()["user_id"].parse::<i32>().ok().unwrap();
460460
let conn = req.db_conn()?;
461461

462-
let data = crate_owners::table.inner_join(crates::table)
463-
.filter(crate_owners::owner_id.eq(user_id).and(crate_owners::owner_kind.eq(OwnerKind::User as i32)))
464-
.select(sum(crates::downloads)).first::<i64>(&*conn)?;
462+
let data = crate_owners::table
463+
.inner_join(crates::table)
464+
.filter(crate_owners::owner_id.eq(user_id).and(
465+
crate_owners::owner_kind.eq(OwnerKind::User as i32),
466+
))
467+
.select(sum(crates::downloads))
468+
.first::<i64>(&*conn)?;
465469

466470
#[derive(RustcEncodable)]
467471
struct R {
468-
total_downloads: i64
472+
total_downloads: i64,
469473
}
470474
Ok(req.json(&R { total_downloads: data }))
471475
}

0 commit comments

Comments
 (0)