Skip to content

Commit 7c843f2

Browse files
committed
controllers::krate::downloads: Use json! macro to simplify JSON serialization code
1 parent f285b17 commit 7c843f2

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

src/controllers/krate/downloads.rs

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub fn downloads(req: &mut dyn RequestExt) -> EndpointResult {
3232
.load(&*conn)?
3333
.into_iter()
3434
.map(VersionDownload::into)
35-
.collect::<Vec<_>>();
35+
.collect::<Vec<EncodableVersionDownload>>();
3636

3737
let sum_downloads = sql::<BigInt>("SUM(version_downloads.downloads)");
3838
let extra: Vec<ExtraDownload> = VersionDownload::belonging_to(rest)
@@ -50,20 +50,11 @@ pub fn downloads(req: &mut dyn RequestExt) -> EndpointResult {
5050
date: String,
5151
downloads: i64,
5252
}
53-
#[derive(Serialize)]
54-
struct R {
55-
version_downloads: Vec<EncodableVersionDownload>,
56-
meta: Meta,
57-
}
58-
#[derive(Serialize)]
59-
struct Meta {
60-
extra_downloads: Vec<ExtraDownload>,
61-
}
62-
let meta = Meta {
63-
extra_downloads: extra,
64-
};
65-
Ok(req.json(&R {
66-
version_downloads: downloads,
67-
meta,
68-
}))
53+
54+
Ok(req.json(&json!({
55+
"version_downloads": downloads,
56+
"meta": {
57+
"extra_downloads": extra,
58+
},
59+
})))
6960
}

0 commit comments

Comments
 (0)