Skip to content

Commit 37f111a

Browse files
committed
controllers::version::deprecated: Use json! macro to simplify JSON serialization code
1 parent 6438e7b commit 37f111a

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/controllers/version/deprecated.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,9 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
4343
.map(|((version, crate_name, published_by), actions)| {
4444
EncodableVersion::from(version, &crate_name, published_by, actions)
4545
})
46-
.collect();
46+
.collect::<Vec<_>>();
4747

48-
#[derive(Serialize)]
49-
struct R {
50-
versions: Vec<EncodableVersion>,
51-
}
52-
Ok(req.json(&R { versions }))
48+
Ok(req.json(&json!({ "versions": versions })))
5349
}
5450

5551
/// Handles the `GET /versions/:version_id` route.
@@ -71,11 +67,6 @@ pub fn show_by_id(req: &mut dyn RequestExt) -> EndpointResult {
7167
.first(&*conn)?;
7268
let audit_actions = VersionOwnerAction::by_version(&conn, &version)?;
7369

74-
#[derive(Serialize)]
75-
struct R {
76-
version: EncodableVersion,
77-
}
78-
Ok(req.json(&R {
79-
version: EncodableVersion::from(version, &krate.name, published_by, audit_actions),
80-
}))
70+
let version = EncodableVersion::from(version, &krate.name, published_by, audit_actions);
71+
Ok(req.json(&json!({ "version": version })))
8172
}

0 commit comments

Comments
 (0)