Merge #906

906: Remove dead code r=carols10cents

I noticed we had a bunch of functions which weren't being used anymore. I've taken the liberty of deleting them. It was pretty easy. 

(Note: This includes all my other open Diesel PRs, only the last commit and the deleted binary commits are actually new. I'll rebase this once those are all merged, but yes we really are done)

Author: bors-voyager[bot]

Cargo.lock

@@ -28,9 +28,7 @@ flate2 = "0.2"
 semver = "0.5"
 url = "1.2.1"
 
-postgres = { version = "0.14.0", features = ["with-time", "with-openssl", "with-serde_json", "with-chrono"] }
 r2d2 = "0.7.0"
-r2d2_postgres = "0.12.0"
 openssl = "0.9.9"
 curl = "0.4"
 oauth2 = "0.3"
@@ -73,6 +71,3 @@ diesel = { version = "0.15.0", features = ["postgres"] }
 [features]
 unstable = []
 lint = ["clippy"]
-
-[replace]
-"postgres:0.14.2" = { git = "https://github.com/sfackler/rust-postgres.git" }

Cargo.toml

@@ -20,9 +20,6 @@ use {db, Config};
 #[allow(missing_debug_implementations)]
 pub struct App {
     /// The database connection pool
-    pub database: db::Pool,
-
-    /// The diesel database connection pool
     pub diesel_database: db::DieselPool,
 
     /// The GitHub OAuth2 configuration
@@ -83,12 +80,6 @@ impl App {
             _ => 1,
         };
 
-        // We need two connection pools until we finish transitioning everything to use diesel.
-        let db_config = r2d2::Config::builder()
-            .pool_size(db_pool_size)
-            .min_idle(db_min_idle)
-            .helper_threads(db_helper_threads)
-            .build();
         let diesel_db_config = r2d2::Config::builder()
             .pool_size(db_pool_size)
             .min_idle(db_min_idle)
@@ -98,7 +89,6 @@ impl App {
         let repo = git2::Repository::open(&config.git_repo_checkout).unwrap();
 
         App {
-            database: db::pool(&config.db_url, db_config),
             diesel_database: db::diesel_pool(&config.db_url, diesel_db_config),
             github: github,
             session_key: config.session_key.clone(),

src/app.rs

@@ -4,12 +4,11 @@ use conduit::{Request, Response};
 use conduit_router::RequestParams;
 use diesel::*;
 use diesel::pg::PgConnection;
-use pg::rows::Row;
 
+use Crate;
 use db::RequestTransaction;
 use schema::*;
 use util::{RequestUtils, CargoResult};
-use {Model, Crate};
 
 #[derive(Clone, Identifiable, Queryable, Debug)]
 #[table_name = "categories"]
@@ -186,22 +185,6 @@ impl<'a> NewCategory<'a> {
     }
 }
 
-impl Model for Category {
-    fn from_row(row: &Row) -> Category {
-        Category {
-            id: row.get("id"),
-            created_at: row.get("created_at"),
-            crates_cnt: row.get("crates_cnt"),
-            category: row.get("category"),
-            slug: row.get("slug"),
-            description: row.get("description"),
-        }
-    }
-    fn table_name(_: Option<Category>) -> &'static str {
-        "categories"
-    }
-}
-
 /// Handles the `GET /categories` route.
 pub fn index(req: &mut Request) -> CargoResult<Response> {
     let conn = req.db_conn()?;