Skip to content

Commit 1cfafc3

Browse files
KixironJoshua Nelson
authored and
Joshua Nelson
committed
Put it on a slip-n-slide
1 parent 8e46c53 commit 1cfafc3

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

src/db/add_package.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,10 @@ fn convert_dependencies(pkg: &MetadataPackage) -> Vec<(String, String, String)>
190190
.map(|dependency| {
191191
let name = dependency.name.clone();
192192
let version = dependency.req.clone();
193-
let kind = dependency.kind.clone().unwrap_or_default();
193+
let kind = dependency
194+
.kind
195+
.clone()
196+
.unwrap_or_else(|| "normal".to_string());
194197

195198
(name, version, kind)
196199
})

src/web/crate_details.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,33 +246,33 @@ impl CrateDetails {
246246
let authors = conn
247247
.query(
248248
"SELECT name, slug
249-
FROM authors
250-
INNER JOIN author_rels ON author_rels.aid = authors.id
251-
WHERE rid = $1",
249+
FROM authors
250+
INNER JOIN author_rels ON author_rels.aid = authors.id
251+
WHERE rid = $1",
252252
&[&release_id],
253253
)
254254
.unwrap();
255-
crate_details.authors.reserve(authors.len());
256255

257-
for row in &authors {
258-
crate_details.authors.push((row.get(0), row.get(1)));
259-
}
256+
crate_details.authors = authors
257+
.into_iter()
258+
.map(|row| (row.get(0), row.get(1)))
259+
.collect();
260260

261261
// get owners
262262
let owners = conn
263263
.query(
264264
"SELECT login, avatar
265-
FROM owners
266-
INNER JOIN owner_rels ON owner_rels.oid = owners.id
267-
WHERE cid = $1",
265+
FROM owners
266+
INNER JOIN owner_rels ON owner_rels.oid = owners.id
267+
WHERE cid = $1",
268268
&[&crate_id],
269269
)
270270
.unwrap();
271-
crate_details.owners.reserve(owners.len());
272271

273-
for row in &owners {
274-
crate_details.owners.push((row.get(0), row.get(1)));
275-
}
272+
crate_details.owners = owners
273+
.into_iter()
274+
.map(|row| (row.get(0), row.get(1)))
275+
.collect();
276276

277277
if !crate_details.build_status {
278278
crate_details.last_successful_build = crate_details

src/web/sitemap.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ pub fn sitemap_handler(req: &mut Request) -> IronResult<Response> {
1919
)
2020
.unwrap();
2121

22-
let releases = query.into_iter()
22+
let releases = query
23+
.into_iter()
2324
.map(|row| {
2425
let time = format!("{}", time::at(row.get(1)).rfc3339());
2526

0 commit comments

Comments
 (0)