Converted convert_dependencies into a map

Author: Kixiron

src/db/add_package.rs

@@ -185,17 +185,16 @@ fn initialize_package_in_database(conn: &Connection, pkg: &MetadataPackage) -> R
 
 /// Convert dependencies into Vec<(String, String, String)>
 fn convert_dependencies(pkg: &MetadataPackage) -> Vec<(String, String, String)> {
-    let mut dependencies: Vec<(String, String, String)> =
-        Vec::with_capacity(pkg.dependencies.len());
+    pkg.dependencies
+        .iter()
+        .map(|dependency| {
+            let name = dependency.name.clone();
+            let version = dependency.req.clone();
+            let kind = dependency.kind.clone().unwrap_or_else(|| "normal".into());
 
-    for dependency in &pkg.dependencies {
-        let name = dependency.name.clone();
-        let version = dependency.req.clone();
-        let kind = dependency.kind.clone().unwrap_or_else(|| "normal".into());
-        dependencies.push((name, version, kind.to_string()));
-    }
-
-    dependencies
+            (name, version, kind)
+        })
+        .collect()
 }
 
 /// Reads readme if there is any read defined in Cargo.toml of a Package

src/index/api.rs

@@ -116,47 +116,43 @@ fn get_owners(pkg: &MetadataPackage) -> Result<Vec<CrateOwner>> {
     res.read_to_string(&mut body).unwrap();
     let json: Value = serde_json::from_str(&body[..])?;
 
-    let mut result = Vec::new();
-    if let Some(owners) = json
+    let owners = json
         .as_object()
         .and_then(|j| j.get("users"))
-        .and_then(|j| j.as_array())
-    {
-        for owner in owners {
-            // FIXME: I know there is a better way to do this
-            let avatar = owner
-                .as_object()
-                .and_then(|o| o.get("avatar"))
-                .and_then(|o| o.as_str())
-                .unwrap_or("");
-            let email = owner
-                .as_object()
-                .and_then(|o| o.get("email"))
-                .and_then(|o| o.as_str())
-                .unwrap_or("");
-            let login = owner
-                .as_object()
-                .and_then(|o| o.get("login"))
-                .and_then(|o| o.as_str())
-                .unwrap_or("");
-            let name = owner
-                .as_object()
-                .and_then(|o| o.get("name"))
-                .and_then(|o| o.as_str())
-                .unwrap_or("");
-
-            if login.is_empty() {
-                continue;
-            }
-
-            result.push(CrateOwner {
-                avatar: avatar.to_string(),
-                email: email.to_string(),
-                login: login.to_string(),
-                name: name.to_string(),
-            });
-        }
-    }
+        .and_then(|j| j.as_array());
+
+    let result = if let Some(owners) = owners {
+        owners
+            .iter()
+            .filter_map(|owner| {
+                fn extract<'a>(owner: &'a Value, field: &str) -> &'a str {
+                    owner
+                        .as_object()
+                        .and_then(|o| o.get(field))
+                        .and_then(|o| o.as_str())
+                        .unwrap_or_default()
+                }
+
+                let avatar = extract(owner, "avatar");
+                let email = extract(owner, "email");
+                let login = extract(owner, "login");
+                let name = extract(owner, "name");
+
+                if login.is_empty() {
+                    return None;
+                }
+
+                Some(CrateOwner {
+                    avatar: avatar.to_string(),
+                    email: email.to_string(),
+                    login: login.to_string(),
+                    name: name.to_string(),
+                })
+            })
+            .collect()
+    } else {
+        Vec::new()
+    };
 
     Ok(result)
 }

src/web/builds.rs

@@ -90,28 +90,29 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
         &[&name, &version]
     ));
 
-    let mut build_list: Vec<Build> = Vec::with_capacity(query.len());
     let mut build_details = None;
-
     // FIXME: getting builds.output may cause performance issues when release have tons of builds
-    for row in query.iter() {
-        let id: i32 = row.get(5);
-
-        let build = Build {
-            id,
-            rustc_version: row.get(6),
-            cratesfyi_version: row.get(7),
-            build_status: row.get(8),
-            build_time: row.get(9),
-            output: row.get(10),
-        };
-
-        if id == req_build_id {
-            build_details = Some(build.clone());
-        }
-
-        build_list.push(build);
-    }
+    let mut build_list = query
+        .into_iter()
+        .map(|row| {
+            let id: i32 = row.get(5);
+
+            let build = Build {
+                id,
+                rustc_version: row.get(6),
+                cratesfyi_version: row.get(7),
+                build_status: row.get(8),
+                build_time: row.get(9),
+                output: row.get(10),
+            };
+
+            if id == req_build_id {
+                build_details = Some(build.clone());
+            }
+
+            build
+        })
+        .collect::<Vec<Build>>();
 
     if req.url.path().join("/").ends_with(".json") {
         use iron::headers::{

src/web/releases.rs

@@ -142,22 +142,18 @@ pub(crate) fn get_releases(conn: &Connection, page: i64, limit: i64, order: Orde
     };
     let query = conn.query(&query, &[&limit, &offset]).unwrap();
 
-    let mut packages = Vec::with_capacity(query.len());
-    for row in query.iter() {
-        let package = Release {
+    query
+        .into_iter()
+        .map(|row| Release {
             name: row.get(0),
             version: row.get(1),
             description: row.get(2),
             target_name: row.get(3),
             release_time: row.get(4),
             rustdoc_status: row.get(5),
             stars: row.get(6),
-        };
-
-        packages.push(package);
-    }
-
-    packages
+        })
+        .collect()
 }
 
 fn get_releases_by_author(
@@ -185,24 +181,27 @@ fn get_releases_by_author(
                  LIMIT $2 OFFSET $3";
     let query = conn.query(&query, &[&author, &limit, &offset]).unwrap();
 
-    let mut author_name = String::new();
-    let mut packages = Vec::with_capacity(query.len());
-    for row in query.iter() {
-        let package = Release {
-            name: row.get(0),
-            version: row.get(1),
-            description: row.get(2),
-            target_name: row.get(3),
-            release_time: row.get(4),
-            rustdoc_status: row.get(5),
-            stars: row.get(6),
-        };
+    let mut author_name = None;
+    let packages = query
+        .into_iter()
+        .map(|row| {
+            if author_name.is_none() {
+                author_name = Some(row.get(7));
+            }
 
-        author_name = row.get(7);
-        packages.push(package);
-    }
+            Release {
+                name: row.get(0),
+                version: row.get(1),
+                description: row.get(2),
+                target_name: row.get(3),
+                release_time: row.get(4),
+                rustdoc_status: row.get(5),
+                stars: row.get(6),
+            }
+        })
+        .collect();
 
-    (author_name, packages)
+    (author_name.unwrap_or_default(), packages)
 }
 
 fn get_releases_by_owner(
@@ -231,28 +230,31 @@ fn get_releases_by_owner(
                  LIMIT $2 OFFSET $3";
     let query = conn.query(&query, &[&author, &limit, &offset]).unwrap();
 
-    let mut author_name = String::new();
-    let mut packages = Vec::with_capacity(query.len());
-    for row in query.iter() {
-        let package = Release {
-            name: row.get(0),
-            version: row.get(1),
-            description: row.get(2),
-            target_name: row.get(3),
-            release_time: row.get(4),
-            rustdoc_status: row.get(5),
-            stars: row.get(6),
-        };
+    let mut author_name = None;
+    let packages = query
+        .into_iter()
+        .map(|row| {
+            if author_name.is_none() {
+                author_name = Some(if !row.get::<usize, String>(7).is_empty() {
+                    row.get(7)
+                } else {
+                    row.get(8)
+                });
+            }
 
-        author_name = if !row.get::<usize, String>(7).is_empty() {
-            row.get(7)
-        } else {
-            row.get(8)
-        };
-        packages.push(package);
-    }
+            Release {
+                name: row.get(0),
+                version: row.get(1),
+                description: row.get(2),
+                target_name: row.get(3),
+                release_time: row.get(4),
+                rustdoc_status: row.get(5),
+                stars: row.get(6),
+            }
+        })
+        .collect();
 
-    (author_name, packages)
+    (author_name.unwrap_or_default(), packages)
 }
 
 /// Get the search results for a crate search query
@@ -650,17 +652,20 @@ pub fn build_queue_handler(req: &mut Request) -> IronResult<Response> {
         )
         .unwrap();
 
-    let mut crates: Vec<(String, String, i32)> = Vec::with_capacity(query.len());
-    for krate in query.iter() {
-        crates.push((
-            krate.get("name"),
-            krate.get("version"),
-            // The priority here is inverted: in the database if a crate has a higher priority it
-            // will be built after everything else, which is counter-intuitive for people not
-            // familiar with docs.rs's inner workings.
-            -krate.get::<_, i32>("priority"),
-        ));
-    }
+    let crates = query
+        .into_iter()
+        .map(|krate| {
+            (
+                krate.get("name"),
+                krate.get("version"),
+                // The priority here is inverted: in the database if a crate has a higher priority it
+                // will be built after everything else, which is counter-intuitive for people not
+                // familiar with docs.rs's inner workings.
+                -krate.get::<_, i32>("priority"),
+            )
+        })
+        .collect::<Vec<(String, String, i32)>>();
+
     let is_empty = crates.is_empty();
     Page::new(crates)
         .title("Build queue")

src/web/sitemap.rs

@@ -19,10 +19,14 @@ pub fn sitemap_handler(req: &mut Request) -> IronResult<Response> {
         )
         .unwrap();
 
-    let mut releases: Vec<(String, String)> = Vec::with_capacity(query.len());
-    for row in query.iter() {
-        releases.push((row.get(0), format!("{}", time::at(row.get(1)).rfc3339())));
-    }
+    let releases = query.into_iter()
+        .map(|row| {
+            let time = format!("{}", time::at(row.get(1)).rfc3339());
+
+            (row.get(0), time)
+        })
+        .collect::<Vec<(String, String)>>();
+
     let mut resp = ctry!(Page::new(releases).to_resp("sitemap"));
     resp.headers
         .set(ContentType("application/xml".parse().unwrap()));