From b27f2317899f1d0fa2e02ade3bd9b3c396ae0685 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Wed, 23 May 2018 16:08:47 -0700
Subject: use diesel::r2d2 instead of r2d2 directly

---
 rust/src/lib.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'rust/src/lib.rs')

diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 8069ad0b..dcefcdab 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -12,7 +12,6 @@ extern crate hyper;
 #[macro_use]
 extern crate error_chain;
 extern crate iron;
-extern crate r2d2;
 extern crate serde_json;
 
 pub mod api_server;
@@ -42,7 +41,7 @@ use iron::middleware::AfterMiddleware;
 use iron::{Request, Response};
 use std::env;
 
-pub type ConnectionPool = r2d2::Pool<ConnectionManager<diesel::pg::PgConnection>>;
+pub type ConnectionPool = diesel::r2d2::Pool<ConnectionManager<diesel::pg::PgConnection>>;
 
 /// Establish a direct database connection. Not currently used, but could be helpful for
 /// single-threaded tests or utilities.
@@ -58,7 +57,7 @@ pub fn server() -> Result<api_server::Server> {
     dotenv().ok();
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     let manager = ConnectionManager::<PgConnection>::new(database_url);
-    let pool = r2d2::Pool::builder()
+    let pool = diesel::r2d2::Pool::builder()
         .build(manager)
         .expect("Failed to create database pool.");
     Ok(api_server::Server { db_pool: pool })
-- 
cgit v1.2.3