From 709f4ab1ac7588f71433ec43a86eaa65a59cf066 Mon Sep 17 00:00:00 2001 From: Tim Kuehn Date: Wed, 16 Mar 2016 21:46:14 -0700 Subject: [PATCH] Add spaces between items in impls. --- tarpc/src/transport/mod.rs | 1 + tarpc/src/transport/tcp.rs | 11 +++++++++++ tarpc/src/transport/unix.rs | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/tarpc/src/transport/mod.rs b/tarpc/src/transport/mod.rs index 6b367ee..f70b2bb 100644 --- a/tarpc/src/transport/mod.rs +++ b/tarpc/src/transport/mod.rs @@ -66,6 +66,7 @@ impl Dialer for P D: Dialer + 'static { type Stream = D::Stream; + fn dial(&self) -> io::Result { (**self).dial() } diff --git a/tarpc/src/transport/tcp.rs b/tarpc/src/transport/tcp.rs index d015374..2a78b65 100644 --- a/tarpc/src/transport/tcp.rs +++ b/tarpc/src/transport/tcp.rs @@ -7,6 +7,7 @@ pub struct TcpTransport(pub A); impl super::Transport for TcpTransport { type Listener = TcpListener; + fn bind(&self) -> io::Result { TcpListener::bind(&self.0) } @@ -14,6 +15,7 @@ impl super::Transport for TcpTransport { impl super::Transport for A { type Listener = TcpListener; + fn bind(&self) -> io::Result { TcpListener::bind(self) } @@ -21,10 +23,13 @@ impl super::Transport for A { impl super::Listener for TcpListener { type Dialer = TcpDialer; + type Stream = TcpStream; + fn accept(&self) -> io::Result { self.accept().map(|(stream, _)| stream) } + fn dialer(&self) -> io::Result> { self.local_addr().map(|addr| TcpDialer(addr)) } @@ -34,12 +39,15 @@ impl super::Stream for TcpStream { fn try_clone(&self) -> io::Result { self.try_clone() } + fn set_read_timeout(&self, dur: Option) -> io::Result<()> { self.set_read_timeout(dur) } + fn set_write_timeout(&self, dur: Option) -> io::Result<()> { self.set_write_timeout(dur) } + fn shutdown(&self) -> io::Result<()> { self.shutdown(::std::net::Shutdown::Both) } @@ -52,12 +60,15 @@ impl super::Dialer for TcpDialer where A: ToSocketAddrs { type Stream = TcpStream; + fn dial(&self) -> io::Result { TcpStream::connect(&self.0) } } + impl super::Dialer for str { type Stream = TcpStream; + fn dial(&self) -> io::Result { TcpStream::connect(self) } diff --git a/tarpc/src/transport/unix.rs b/tarpc/src/transport/unix.rs index 328053a..9a4b590 100644 --- a/tarpc/src/transport/unix.rs +++ b/tarpc/src/transport/unix.rs @@ -10,6 +10,7 @@ impl

super::Transport for UnixTransport

where P: AsRef { type Listener = UnixListener; + fn bind(&self) -> io::Result { UnixListener::bind(&self.0) } @@ -22,6 +23,7 @@ impl

super::Dialer for UnixDialer

where P: AsRef { type Stream = UnixStream; + fn dial(&self) -> io::Result { UnixStream::connect(&self.0) } @@ -29,10 +31,13 @@ impl

super::Dialer for UnixDialer

impl super::Listener for UnixListener { type Stream = UnixStream; + type Dialer = UnixDialer; + fn accept(&self) -> io::Result { self.accept().map(|(stream, _)| stream) } + fn dialer(&self) -> io::Result> { self.local_addr().and_then(|addr| { match addr.as_pathname() { @@ -50,12 +55,15 @@ impl super::Stream for UnixStream { fn try_clone(&self) -> io::Result { self.try_clone() } + fn set_read_timeout(&self, timeout: Option) -> io::Result<()> { self.set_read_timeout(timeout) } + fn set_write_timeout(&self, timeout: Option) -> io::Result<()> { self.set_write_timeout(timeout) } + fn shutdown(&self) -> io::Result<()> { self.shutdown(::std::net::Shutdown::Both) }