UFCS is a thing now

Author: alexcrichton

src/bin/update-downloads.rs

@@ -135,7 +135,7 @@ mod test {
     use postgres;
     use semver;
 
-    use cargo_registry::{Version, Crate, User};
+    use cargo_registry::{Version, Crate, User, Model};
 
     fn conn() -> postgres::Connection {
         postgres::Connection::connect(&::env("TEST_DATABASE_URL")[..],

src/download.rs

@@ -1,9 +1,7 @@
-use pg::GenericConnection;
 use pg::rows::Row;
 use time::Timespec;
 
 use Model;
-use util::CargoResult;
 
 pub struct VersionDownload {
     pub id: i32,
@@ -22,11 +20,6 @@ pub struct EncodableVersionDownload {
 }
 
 impl VersionDownload {
-    pub fn find(conn: &GenericConnection,
-                id: i32) -> CargoResult<VersionDownload> {
-        Model::find(conn, id)
-    }
-
     pub fn encodable(self) -> EncodableVersionDownload {
         let VersionDownload { id, version_id, downloads, counted: _,
                               date } = self;
@@ -60,12 +53,6 @@ pub struct CrateDownload {
     pub date: Timespec,
 }
 
-impl CrateDownload {
-    pub fn find(conn: &GenericConnection, id: i32) -> CargoResult<CrateDownload> {
-        Model::find(conn, id)
-    }
-}
-
 impl Model for CrateDownload {
     fn from_row(row: &Row) -> CrateDownload {
         CrateDownload {

src/keyword.rs

@@ -30,10 +30,6 @@ pub struct EncodableKeyword {
 }
 
 impl Keyword {
-    pub fn find(conn: &GenericConnection, id: i32) -> CargoResult<Keyword> {
-        Model::find(conn, id)
-    }
-
     pub fn find_by_keyword(conn: &GenericConnection, name: &str)
                            -> CargoResult<Option<Keyword>> {
         let stmt = try!(conn.prepare("SELECT * FROM keywords \

src/krate.rs

@@ -81,10 +81,6 @@ pub struct CrateLinks {
 }
 
 impl Crate {
-    pub fn find(conn: &GenericConnection, id: i32) -> CargoResult<Crate> {
-        Model::find(conn, id)
-    }
-
     pub fn find_by_name(conn: &GenericConnection,
                         name: &str) -> CargoResult<Crate> {
         let stmt = try!(conn.prepare("SELECT * FROM crates \

src/tests/user.rs

@@ -4,6 +4,7 @@ use conduit::{Handler, Request, Response, Method};
 use conduit_middleware::Middleware;
 use conduit_test::MockRequest;
 
+use cargo_registry::Model;
 use cargo_registry::krate::EncodableCrate;
 use cargo_registry::user::{User, EncodableUser};
 use cargo_registry::db::RequestTransaction;

src/user/middleware.rs

@@ -4,6 +4,7 @@ use conduit_middleware;
 use conduit::Request;
 use conduit_cookie::RequestSession;
 
+use Model;
 use db::RequestTransaction;
 use super::User;
 use util::errors::{CargoResult, Unauthorized, ChainError, std_error};

src/user/mod.rs

@@ -41,10 +41,6 @@ pub struct EncodableUser {
 }
 
 impl User {
-    pub fn find(conn: &GenericConnection, id: i32) -> CargoResult<User> {
-        Model::find(conn, id)
-    }
-
     pub fn find_by_login(conn: &GenericConnection,
                          login: &str) -> CargoResult<User> {
         let stmt = try!(conn.prepare("SELECT * FROM users

src/version.rs

@@ -61,10 +61,6 @@ pub struct VersionLinks {
 }
 
 impl Version {
-    pub fn find(conn: &GenericConnection, id: i32) -> CargoResult<Version> {
-        Model::find(conn, id)
-    }
-
     pub fn find_by_num(conn: &GenericConnection,
                        crate_id: i32,
                        num: &semver::Version)