summaryrefslogtreecommitdiffstats
path: root/rust/src/lib.rs
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2018-05-15 14:59:28 -0700
committerBryan Newbold <bnewbold@robocracy.org>2018-05-15 14:59:28 -0700
commit2fd925e4eb3730c36519096e4a74b2de5998e8d4 (patch)
tree63bd81c57fa02ae8359c20bedd8cbc7da0980d6b /rust/src/lib.rs
parente35b10434aa4ceb2708610f13fe078e977496ce5 (diff)
downloadfatcat-2fd925e4eb3730c36519096e4a74b2de5998e8d4.tar.gz
fatcat-2fd925e4eb3730c36519096e4a74b2de5998e8d4.zip
start ripping out cruft
Diffstat (limited to 'rust/src/lib.rs')
-rw-r--r--rust/src/lib.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index b8f2be88..e2b2f892 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -5,7 +5,6 @@ extern crate chrono;
extern crate diesel;
extern crate dotenv;
extern crate futures;
-extern crate iron_diesel_middleware;
#[macro_use]
extern crate hyper;
extern crate swagger;
@@ -13,7 +12,6 @@ extern crate swagger;
extern crate error_chain;
extern crate iron;
extern crate r2d2;
-extern crate r2d2_diesel;
pub mod api_server;
pub mod database_schema;
@@ -25,13 +23,13 @@ mod errors {
pub use self::errors::*;
use diesel::pg::PgConnection;
use diesel::prelude::*;
+use diesel::r2d2::ConnectionManager;
use dotenv::dotenv;
use iron::middleware::AfterMiddleware;
use iron::{Request, Response};
-use r2d2_diesel::ConnectionManager;
use std::env;
-pub type ConnectionPool = r2d2::Pool<r2d2_diesel::ConnectionManager<diesel::pg::PgConnection>>;
+pub type ConnectionPool = r2d2::Pool<ConnectionManager<diesel::pg::PgConnection>>;
pub fn establish_connection() -> PgConnection {
dotenv().ok();