Merge pull request #273 from espindola/queue_id

Make queue_id non-optional

Author: blackbeam

src/conn/pool/futures/get_conn.rs

@@ -66,7 +66,7 @@ impl GetConnInner {
 #[derive(Debug)]
 #[must_use = "futures do nothing unless you `.await` or poll them"]
 pub struct GetConn {
-    pub(crate) queue_id: Option<QueueId>,
+    pub(crate) queue_id: QueueId,
     pub(crate) pool: Option<Pool>,
     pub(crate) inner: GetConnInner,
     reset_upon_returning_to_a_pool: bool,
@@ -77,7 +77,7 @@ pub struct GetConn {
 impl GetConn {
     pub(crate) fn new(pool: &Pool, reset_upon_returning_to_a_pool: bool) -> GetConn {
         GetConn {
-            queue_id: None,
+            queue_id: QueueId::next(),
             pool: Some(pool.clone()),
             inner: GetConnInner::New,
             reset_upon_returning_to_a_pool,
@@ -112,7 +112,7 @@ impl Future for GetConn {
         loop {
             match self.inner {
                 GetConnInner::New => {
-                    let queue_id = *self.queue_id.get_or_insert_with(QueueId::next);
+                    let queue_id = self.queue_id;
                     let next = ready!(Pin::new(self.pool_mut()).poll_new_conn(cx, queue_id))?;
                     match next {
                         GetConnInner::Connecting(conn_fut) => {
@@ -185,9 +185,7 @@ impl Drop for GetConn {
         if let Some(pool) = self.pool.take() {
             // Remove the waker from the pool's waitlist in case this task was
             // woken by another waker, like from tokio::time::timeout.
-            if let Some(queue_id) = self.queue_id {
-                pool.unqueue(queue_id);
-            }
+            pool.unqueue(self.queue_id);
             if let GetConnInner::Connecting(..) = self.inner.take() {
                 pool.cancel_connection();
             }