Fix merge conflicts

Author: sgrif

src/krate.rs

@@ -435,10 +435,8 @@ impl Crate {
         let stmt = conn.prepare("SELECT num FROM versions WHERE crate_id = $1
                                  AND yanked = 'f'")?;
         let rows = stmt.query(&[&self.id])?;
-        Ok(rows.iter()
-            .map(|r| semver::Version::parse(&r.get::<_, String>("num")).unwrap())
-            .max()
-            .unwrap_or_else(|| semver::Version::parse("0.0.0").unwrap()))
+        Ok(Version::max(rows.iter().map(|r| r.get::<_, String>("num"))
+           .map(|s| semver::Version::parse(&s).unwrap())))
     }
 
     pub fn versions(&self, conn: &GenericConnection) -> CargoResult<Vec<Version>> {
@@ -707,12 +705,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
         .load::<Version>(conn)?
         .grouped_by(&crates)
         .into_iter()
-        .map(|versions| {
-            versions.into_iter()
-                .map(|v| v.num)
-                .max()
-                .unwrap_or_else(|| semver::Version::parse("0.0.0").unwrap())
-        });
+        .map(|versions| Version::max(versions.into_iter().map(|v| v.num)));
 
     let crates = versions.zip(crates).map(|(max_version, krate)| {
         // FIXME: If we add crate_id to the Badge enum we can eliminate

src/tests/all.rs

@@ -183,7 +183,6 @@ fn new_user(login: &str) -> NewUser {
         name: None,
         gh_avatar: None,
         gh_access_token: "some random token",
-        api_token: "some random token",
     }
 }
 

src/version.rs

@@ -192,6 +192,20 @@ impl Version {
                      &[&yanked, &self.id])?;
         Ok(())
     }
+
+    pub fn max<T>(versions: T) -> semver::Version where
+        T: IntoIterator<Item=semver::Version>,
+    {
+        versions.into_iter()
+            .max()
+            .unwrap_or_else(|| semver::Version {
+                major: 0,
+                minor: 0,
+                patch: 0,
+                pre: vec![],
+                build: vec![],
+            })
+    }
 }
 
 impl Queryable<versions::SqlType, Pg> for Version {