Merge pull request #3 from zainkabani/zain/fix-branch

Fix merge conflict

Author: levkk

bb8/src/inner.rs

@@ -201,7 +201,7 @@ where
 
         let mut locked = self.inner.internals.lock();
         match conn {
-            Some(conn) => locked.put(conn, None),
+            Some(conn) => locked.put(conn, None, self.inner.clone()),
             None => {
                 let approvals = locked.dropped(1, &self.inner.statics);
                 self.spawn_replenishing_approvals(approvals);
@@ -243,7 +243,10 @@ where
             match conn {
                 Ok(conn) => {
                     let conn = Conn::new(conn);
-                    shared.internals.lock().put(conn, Some(approval));
+                    shared
+                        .internals
+                        .lock()
+                        .put(conn, Some(approval), self.inner.clone());
                     return Ok(());
                 }
                 Err(e) => {

bb8/src/internals.rs

@@ -61,7 +61,12 @@ where
             .map(|idle| (idle.conn, self.wanted(config)))
     }
 
-    pub(crate) fn put(&mut self, conn: Conn<M::Connection>, approval: Option<Approval>) {
+    pub(crate) fn put(
+        &mut self,
+        conn: Conn<M::Connection>,
+        approval: Option<Approval>,
+        pool: Arc<SharedPool<M>>,
+    ) {
         if approval.is_some() {
             self.pending_conns -= 1;
             self.num_conns += 1;
@@ -70,7 +75,7 @@ where
         let queue_strategy = pool.statics.queue_strategy;
 
         // Queue it in the idle queue
-        let conn = IdleConn::from(guard.conn.take().unwrap());
+        let conn = IdleConn::from(conn);
         match queue_strategy {
             QueueStrategy::Fifo => self.conns.push_back(conn),
             QueueStrategy::Lifo => self.conns.push_front(conn),