ptrs remove identity design example in favor of passthrough

crates/ptrs/src/lib.rs

@@ -19,7 +19,7 @@ pub use helpers::*;
 
 pub trait PluggableTransport<T> {
     type ClientBuilder: ClientBuilderByTypeInst<T>;
-    type ServerBuilder: ServerBuilder;
+    type ServerBuilder: ServerBuilder<T>;
     // type Client: ClientTransport<T, E>;
     // type Server: ServerTransport<T>;
 
@@ -97,16 +97,16 @@ pub trait ClientTransport<InRW, InErr> {
 pub trait ServerTransport<InRW> {
     type OutRW;
     type OutErr: std::error::Error;
-    type Builder: ServerBuilder;
+    type Builder: ServerBuilder<InRW>;
 
     /// Create/accept a connection for the pluggable transport client using the
     /// provided (pre-existing/pre-connected) Read/Write object as the
     /// underlying socket.
     fn reveal(&self, io: InRW) -> Pin<F<Self::OutRW, Self::OutErr>>;
 }
 
-pub trait ServerBuilder: Default {
-    type ServerPT;
+pub trait ServerBuilder<T>: Default {
+    type ServerPT: ServerTransport<T>;
     type Error: std::error::Error;
     type Transport;
 
@@ -139,9 +139,10 @@ pub trait ServerBuilder: Default {
 }
 
 /// Server Transport trait2 - try using futures instead of actual objects
-// This doesn't work because it requires the listener object that was used
-// to create the `input` Future must live for `'static` for the future to
-// be valid, but that can't be guaranteed and is difficult to work with.
+///
+/// This doesn't work because it requires the listener object that was used
+/// to create the `input` Future must live for `'static` for the future to
+/// be valid, but that can't be guaranteed and is difficult to work with.
 pub trait ServerTransport2<InRW, InErr> {
     type OutRW;
     type OutErr: std::error::Error;

crates/ptrs/src/passthrough.rs

@@ -31,7 +31,7 @@ where
 #[derive(Debug, Default)]
 pub struct BuilderS {}
 
-impl ServerBuilder for BuilderS {
+impl<T: Send + 'static> ServerBuilder<T> for BuilderS {
     type Error = std::io::Error;
     type ServerPT = Passthrough;
     type Transport = Passthrough;
@@ -184,7 +184,7 @@ impl Passthrough {
 mod design_tests {
 
     use tokio::{
-        io::{AsyncReadExt, AsyncWriteExt},
+        io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},
         net::TcpStream,
     };
     use tracing::info;
@@ -456,6 +456,7 @@ mod design_tests {
         Box<dyn std::error::Error>,
     >
     where
+        T: AsyncRead + AsyncWrite + Send,
         B: ClientBuilderByTypeInst<T>,
         B::ClientPT: ClientTransport<T, E>,
         B::Error: std::error::Error + 'static,
@@ -520,17 +521,17 @@ mod design_tests {
     ) -> Result<
         Pin<
             FutureResult<
-                <<<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder>::ServerPT as ServerTransport<T>>::OutRW,
-                <<<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder>::ServerPT as ServerTransport<T>>::OutErr,
+                <<<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder<T>>::ServerPT as ServerTransport<T>>::OutRW,
+                <<<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder<T>>::ServerPT as ServerTransport<T>>::OutErr,
             >,
         >,
         Box<dyn std::error::Error>,
     >
     where
         P: PluggableTransport<T>,
         P::ClientBuilder: ClientBuilderByTypeInst<T>,
-        <<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder>::ServerPT: ServerTransport<T>,
-        <<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder>::Error: std::error::Error + 'static,
+        <<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder<T>>::ServerPT: ServerTransport<T>,
+        <<P as PluggableTransport<T>>::ServerBuilder as ServerBuilder<T>>::Error: std::error::Error + 'static,
         E: std::error::Error + 'static,
     {
         Ok(P::server_builder()
@@ -599,14 +600,15 @@ mod design_tests {
     ) -> Result<
         Pin<
             FutureResult<
-                <<B as ServerBuilder>::ServerPT as ServerTransport<T>>::OutRW,
-                <<B as ServerBuilder>::ServerPT as ServerTransport<T>>::OutErr,
+                <<B as ServerBuilder<T>>::ServerPT as ServerTransport<T>>::OutRW,
+                <<B as ServerBuilder<T>>::ServerPT as ServerTransport<T>>::OutErr,
             >,
         >,
         Box<dyn std::error::Error>,
     >
     where
-        B: ServerBuilder,
+        T: AsyncRead + AsyncWrite + Send,
+        B: ServerBuilder<T>,
         B::ServerPT: ServerTransport<T>,
         B::Error: std::error::Error + 'static,
     {