Rename raw cancel query

Author: sfackler

tokio-postgres/src/config.rs

@@ -17,10 +17,10 @@ use tokio_io::{AsyncRead, AsyncWrite};
 
 #[cfg(feature = "runtime")]
 use crate::proto::ConnectFuture;
-use crate::proto::HandshakeFuture;
+use crate::proto::{CancelQueryRawFuture, HandshakeFuture};
+use crate::{CancelData, CancelQueryRaw, Error, Handshake, TlsMode};
 #[cfg(feature = "runtime")]
 use crate::{Connect, MakeTlsMode, Socket};
-use crate::{Error, Handshake, TlsMode};
 
 #[cfg(feature = "runtime")]
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -277,6 +277,19 @@ impl Config {
     {
         Connect(ConnectFuture::new(make_tls_mode, Ok(self.clone())))
     }
+
+    pub fn cancel_query_raw<S, T>(
+        &self,
+        stream: S,
+        tls_mode: T,
+        cancel_data: CancelData,
+    ) -> CancelQueryRaw<S, T>
+    where
+        S: AsyncRead + AsyncWrite,
+        T: TlsMode<S>,
+    {
+        CancelQueryRaw(CancelQueryRawFuture::new(stream, tls_mode, cancel_data))
+    }
 }
 
 impl FromStr for Config {

tokio-postgres/src/lib.rs

@@ -116,7 +116,6 @@ use tokio_io::{AsyncRead, AsyncWrite};
 
 pub use crate::config::*;
 pub use crate::error::*;
-use crate::proto::CancelFuture;
 pub use crate::row::*;
 #[cfg(feature = "runtime")]
 pub use crate::socket::Socket;
@@ -152,14 +151,6 @@ where
     Connect(proto::ConnectFuture::new(tls_mode, config.parse()))
 }
 
-pub fn cancel_query<S, T>(stream: S, tls_mode: T, cancel_data: CancelData) -> CancelQuery<S, T>
-where
-    S: AsyncRead + AsyncWrite,
-    T: TlsMode<S>,
-{
-    CancelQuery(CancelFuture::new(stream, tls_mode, cancel_data))
-}
-
 pub struct Client(proto::Client);
 
 impl Client {
@@ -265,12 +256,12 @@ pub enum AsyncMessage {
 }
 
 #[must_use = "futures do nothing unless polled"]
-pub struct CancelQuery<S, T>(proto::CancelFuture<S, T>)
+pub struct CancelQueryRaw<S, T>(proto::CancelQueryRawFuture<S, T>)
 where
     S: AsyncRead + AsyncWrite,
     T: TlsMode<S>;
 
-impl<S, T> Future for CancelQuery<S, T>
+impl<S, T> Future for CancelQueryRaw<S, T>
 where
     S: AsyncRead + AsyncWrite,
     T: TlsMode<S>,

tokio-postgres/src/proto/cancel.rs renamed to tokio-postgres/src/proto/cancel_query_raw.rs

@@ -9,7 +9,7 @@ use crate::proto::TlsFuture;
 use crate::{CancelData, TlsMode};
 
 #[derive(StateMachineFuture)]
-pub enum Cancel<S, T>
+pub enum CancelQueryRaw<S, T>
 where
     S: AsyncRead + AsyncWrite,
     T: TlsMode<S>,
@@ -31,7 +31,7 @@ where
     Failed(Error),
 }
 
-impl<S, T> PollCancel<S, T> for Cancel<S, T>
+impl<S, T> PollCancelQueryRaw<S, T> for CancelQueryRaw<S, T>
 where
     S: AsyncRead + AsyncWrite,
     T: TlsMode<S>,
@@ -69,12 +69,12 @@ where
     }
 }
 
-impl<S, T> CancelFuture<S, T>
+impl<S, T> CancelQueryRawFuture<S, T>
 where
     S: AsyncRead + AsyncWrite,
     T: TlsMode<S>,
 {
-    pub fn new(stream: S, tls_mode: T, cancel_data: CancelData) -> CancelFuture<S, T> {
-        Cancel::start(TlsFuture::new(stream, tls_mode), cancel_data)
+    pub fn new(stream: S, tls_mode: T, cancel_data: CancelData) -> CancelQueryRawFuture<S, T> {
+        CancelQueryRaw::start(TlsFuture::new(stream, tls_mode), cancel_data)
     }
 }

tokio-postgres/src/proto/mod.rs

@@ -19,7 +19,7 @@ macro_rules! try_ready_closed {
 }
 
 mod bind;
-mod cancel;
+mod cancel_query_raw;
 mod client;
 mod codec;
 #[cfg(feature = "runtime")]
@@ -44,7 +44,7 @@ mod typeinfo_composite;
 mod typeinfo_enum;
 
 pub use crate::proto::bind::BindFuture;
-pub use crate::proto::cancel::CancelFuture;
+pub use crate::proto::cancel_query_raw::CancelQueryRawFuture;
 pub use crate::proto::client::Client;
 pub use crate::proto::codec::PostgresCodec;
 #[cfg(feature = "runtime")]

tokio-postgres/tests/test/main.rs

@@ -245,7 +245,7 @@ fn cancel_query() {
         })
         .then(|r| {
             let s = r.unwrap();
-            tokio_postgres::cancel_query(s, NoTls, cancel_data)
+            tokio_postgres::Config::new().cancel_query_raw(s, NoTls, cancel_data)
         })
         .then(|r| {
             r.unwrap();