Fix merge conflicts

Author: sgrif

src/krate.rs

@@ -436,10 +436,7 @@ 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| Cow::Owned(r.get("num")))
-            .max_by_key(|v| semver::Version::parse(&v).ok())
-            .unwrap_or_else(|| Cow::Borrowed("0.0.0")))
+        Ok(Version::max(rows.iter().map(|r| r.get("num"))))
     }
 
     pub fn versions(&self, conn: &GenericConnection) -> CargoResult<Vec<Version>> {
@@ -708,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

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::collections::HashMap;
 
 use conduit::{Request, Response};
@@ -191,6 +192,15 @@ impl Version {
                      &[&yanked, &self.id])?;
         Ok(())
     }
+
+    pub fn max<T>(versions: T) -> Cow<'static, str> where
+        T: IntoIterator<Item=String>,
+    {
+        versions.into_iter()
+            .map(Cow::Owned)
+            .max_by_key(|v| semver::Version::parse(&v).ok())
+            .unwrap_or_else(|| Cow::Borrowed("0.0.0"))
+    }
 }
 
 impl Queryable<versions::SqlType, Pg> for Version {
@@ -203,7 +213,7 @@ impl Queryable<versions::SqlType, Pg> for Version {
         Version {
             id: row.0,
             crate_id: row.1,
-            num: semver::Version::parse(&row.2).unwrap(),
+            num: row.2,
             updated_at: row.3,
             created_at: row.4,
             downloads: row.5,