From 56a31ea0eeebd4fa111fca7b459cf1216e553472 Mon Sep 17 00:00:00 2001
From: krircc <krircc@aliyun.com>
Date: Tue, 3 Apr 2018 22:37:53 +0800
Subject: [PATCH] only use diesel::r2d2 feature. no need r2d2_diesel create

---
 examples/diesel/Cargo.toml  | 3 +--
 examples/diesel/src/db.rs   | 3 +--
 examples/diesel/src/main.rs | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/examples/diesel/Cargo.toml b/examples/diesel/Cargo.toml
index ac9122c6f..2551b9628 100644
--- a/examples/diesel/Cargo.toml
+++ b/examples/diesel/Cargo.toml
@@ -15,7 +15,6 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 
-diesel = { version = "1.0", features = ["sqlite"] }
+diesel = { version = "^1.1.0", features = ["sqlite", "r2d2"] }
 r2d2 = "0.8"
-r2d2-diesel = "1.0"
 dotenv = "0.10"
diff --git a/examples/diesel/src/db.rs b/examples/diesel/src/db.rs
index b835d34f4..13b376823 100644
--- a/examples/diesel/src/db.rs
+++ b/examples/diesel/src/db.rs
@@ -4,8 +4,7 @@ use diesel;
 use actix_web::*;
 use actix::prelude::*;
 use diesel::prelude::*;
-use r2d2::Pool;
-use r2d2_diesel::ConnectionManager;
+use diesel::r2d2::{ Pool, ConnectionManager };
 
 use models;
 use schema;
diff --git a/examples/diesel/src/main.rs b/examples/diesel/src/main.rs
index b821e9ffa..2fd7087ce 100644
--- a/examples/diesel/src/main.rs
+++ b/examples/diesel/src/main.rs
@@ -11,7 +11,6 @@ extern crate serde_derive;
 #[macro_use]
 extern crate diesel;
 extern crate r2d2;
-extern crate r2d2_diesel;
 extern crate uuid;
 extern crate futures;
 extern crate actix;
@@ -23,7 +22,7 @@ use actix_web::{http, server, middleware,
                 App, Path, State, HttpResponse, AsyncResponder, FutureResponse};
 
 use diesel::prelude::*;
-use r2d2_diesel::ConnectionManager;
+use diesel::r2d2::{ Pool, ConnectionManager };
 use futures::future::Future;
 
 mod db;