update api usage

Author: fafhrd91

Cargo.toml

@@ -33,5 +33,6 @@ env_logger = "0.9"
 
 [patch.crates-io]
 ntex = { git = "https://github.com/ntex-rs/ntex.git" }
+ntex-rt = { git = "https://github.com/ntex-rs/ntex.git" }
 ntex-io = { git = "https://github.com/ntex-rs/ntex.git" }
 ntex-tls = { git = "https://github.com/ntex-rs/ntex.git" }

src/client.rs

@@ -30,31 +30,31 @@ impl Client {
         ntex::rt::spawn(async move {
             poll_fn(|cx| loop {
                 match ready!(io.poll_recv(&Codec, cx)) {
-                    Some(Ok(item)) => {
+                    Ok(Some(item)) => {
                         if let Some(tx) = queue2.borrow_mut().pop_front() {
                             let _ = tx.send(Ok(item));
                         } else {
                             log::error!("Unexpected redis response: {:?}", item);
                         }
                         continue;
                     }
-                    Some(Err(Either::Left(e))) => {
+                    Err(Either::Left(e)) => {
                         if let Some(tx) = queue2.borrow_mut().pop_front() {
                             let _ = tx.send(Err(e));
                         }
                         queue2.borrow_mut().clear();
                         let _ = ready!(io.poll_shutdown(cx));
                         return Poll::Ready(());
                     }
-                    Some(Err(Either::Right(e))) => {
+                    Err(Either::Right(e)) => {
                         if let Some(tx) = queue2.borrow_mut().pop_front() {
                             let _ = tx.send(Err(e.into()));
                         }
                         queue2.borrow_mut().clear();
                         let _ = ready!(io.poll_shutdown(cx));
                         return Poll::Ready(());
                     }
-                    None => return Poll::Ready(()),
+                    Ok(None) => return Poll::Ready(()),
                 }
             })
             .await

src/connector.rs

@@ -87,10 +87,7 @@ where
     }
 
     /// Use custom boxed connector
-    pub fn boxed_connector<U>(
-        self,
-        connector: U,
-    ) -> RedisConnector<A, U>
+    pub fn boxed_connector<U>(self, connector: U) -> RedisConnector<A, U>
     where
         U: Service<Request = Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
     {

src/lib.rs

@@ -78,6 +78,10 @@ pub fn gen_random_key() -> String {
     use rand::distributions::Alphanumeric;
     use rand::{thread_rng, Rng};
 
-    let key: String = thread_rng().sample_iter(&Alphanumeric).take(12).map(char::from).collect();
+    let key: String = thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(12)
+        .map(char::from)
+        .collect();
     key
 }

src/simple.rs

@@ -25,12 +25,12 @@ impl SimpleClient {
         self.io.encode(cmd.to_request(), &Codec)?;
 
         poll_fn(|cx| match ready!(self.io.poll_recv(&Codec, cx)) {
-            Some(Ok(item)) => Poll::Ready(U::to_output(
+            Ok(Some(item)) => Poll::Ready(U::to_output(
                 item.into_result().map_err(CommandError::Error)?,
             )),
-            Some(Err(Either::Left(err))) => Poll::Ready(Err(CommandError::Protocol(err))),
-            Some(Err(Either::Right(err))) => Poll::Ready(Err(CommandError::Protocol(err.into()))),
-            None => Poll::Ready(Err(CommandError::Protocol(Error::Disconnected))),
+            Err(Either::Left(err)) => Poll::Ready(Err(CommandError::Protocol(err))),
+            Err(Either::Right(err)) => Poll::Ready(Err(CommandError::Protocol(err.into()))),
+            Ok(None) => Poll::Ready(Err(CommandError::Protocol(Error::Disconnected))),
         })
         .await
     }