Skip to content

Commit 626de23

Browse files
committed
Extract a method for encoding a crate without all its metadata
I draw the line at 3 None arguments.
1 parent 7d70f99 commit 626de23

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/krate.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ impl Crate {
229229
parts.next().is_none()
230230
}
231231

232+
pub fn minimal_encodable(self) -> EncodableCrate {
233+
self.encodable(None, None, None)
234+
}
235+
232236
pub fn encodable(self,
233237
versions: Option<Vec<i32>>,
234238
keywords: Option<&[Keyword]>,
@@ -582,7 +586,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
582586
let mut crates = Vec::new();
583587
for row in try!(stmt.query(&args)).iter() {
584588
let krate: Crate = Model::from_row(&row);
585-
crates.push(krate.encodable(None, None, None));
589+
crates.push(krate.minimal_encodable());
586590
}
587591

588592
// Query for the total count of crates
@@ -617,7 +621,7 @@ pub fn summary(req: &mut Request) -> CargoResult<Response> {
617621
let rows = try!(stmt.query(&[]));
618622
Ok(rows.iter().map(|r| {
619623
let krate: Crate = Model::from_row(&r);
620-
krate.encodable(None, None, None)
624+
krate.minimal_encodable()
621625
}).collect::<Vec<EncodableCrate>>())
622626
};
623627
let new_crates = try!(tx.prepare("SELECT * FROM crates \
@@ -794,7 +798,7 @@ pub fn new(req: &mut Request) -> CargoResult<Response> {
794798

795799
#[derive(RustcEncodable)]
796800
struct R { krate: EncodableCrate }
797-
Ok(req.json(&R { krate: krate.encodable(None, None, None) }))
801+
Ok(req.json(&R { krate: krate.minimal_encodable() }))
798802
}
799803

800804
fn parse_new_headers(req: &mut Request) -> CargoResult<(upload::NewCrate, User)> {

src/user/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ pub fn updates(req: &mut Request) -> CargoResult<Response> {
336336
}
337337

338338
// Encode everything!
339-
let crates = crates.into_iter().map(|c| c.encodable(None, None, None)).collect();
339+
let crates = crates.into_iter().map(|c| c.minimal_encodable()).collect();
340340
let versions = versions.into_iter().map(|v| {
341341
let id = v.crate_id;
342342
v.encodable(&map[&id])

0 commit comments

Comments
 (0)