Skip to content

Commit ebdcffb

Browse files
committed
Style
1 parent ef9143c commit ebdcffb

File tree

1 file changed

+44
-42
lines changed

1 file changed

+44
-42
lines changed

core/src/transport/boxed.rs

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,31 @@ use transport::{MuxedTransport, Transport};
2828
/// See the `Transport::boxed` method.
2929
#[inline]
3030
pub fn boxed<T>(transport: T) -> Boxed<T::Output>
31-
where T: Transport + Clone + Send + Sync + 'static,
32-
T::Dial: Send + 'static,
33-
T::Listener: Send + 'static,
34-
T::ListenerUpgrade: Send + 'static,
35-
T::MultiaddrFuture: Send + 'static,
31+
where
32+
T: Transport + Clone + Send + Sync + 'static,
33+
T::Dial: Send + 'static,
34+
T::Listener: Send + 'static,
35+
T::ListenerUpgrade: Send + 'static,
36+
T::MultiaddrFuture: Send + 'static,
3637
{
3738
Boxed {
38-
inner: Arc::new(transport) as Arc<_>
39+
inner: Arc::new(transport) as Arc<_>,
3940
}
4041
}
4142
/// See the `Transport::boxed_muxed` method.
4243
#[inline]
4344
pub fn boxed_muxed<T>(transport: T) -> BoxedMuxed<T::Output>
44-
where T: MuxedTransport + Clone + Send + Sync + 'static,
45-
T::Dial: Send + 'static,
46-
T::Listener: Send + 'static,
47-
T::ListenerUpgrade: Send + 'static,
48-
T::MultiaddrFuture: Send + 'static,
49-
T::Incoming: Send + 'static,
50-
T::IncomingUpgrade: Send + 'static,
45+
where
46+
T: MuxedTransport + Clone + Send + Sync + 'static,
47+
T::Dial: Send + 'static,
48+
T::Listener: Send + 'static,
49+
T::ListenerUpgrade: Send + 'static,
50+
T::MultiaddrFuture: Send + 'static,
51+
T::Incoming: Send + 'static,
52+
T::IncomingUpgrade: Send + 'static,
5153
{
5254
BoxedMuxed {
53-
inner: Arc::new(transport) as Arc<_>
55+
inner: Arc::new(transport) as Arc<_>,
5456
}
5557
}
5658

@@ -68,20 +70,20 @@ trait Abstract<O> {
6870
}
6971

7072
impl<T, O> Abstract<O> for T
71-
where T: Transport<Output = O> + Clone + 'static,
72-
T::Dial: Send + 'static,
73-
T::Listener: Send + 'static,
74-
T::ListenerUpgrade: Send + 'static,
75-
T::MultiaddrFuture: Send + 'static,
73+
where
74+
T: Transport<Output = O> + Clone + 'static,
75+
T::Dial: Send + 'static,
76+
T::Listener: Send + 'static,
77+
T::ListenerUpgrade: Send + 'static,
78+
T::MultiaddrFuture: Send + 'static,
7679
{
7780
fn listen_on(&self, addr: Multiaddr) -> Result<(Listener<O>, Multiaddr), Multiaddr> {
78-
let (listener, new_addr) = Transport::listen_on(self.clone(), addr)
79-
.map_err(|(_, addr)| addr)?;
80-
let fut = listener
81-
.map(|upgrade| {
82-
let fut = upgrade.map(|(out, addr)| (out, Box::new(addr) as MultiaddrFuture));
83-
Box::new(fut) as ListenerUpgrade<O>
84-
});
81+
let (listener, new_addr) =
82+
Transport::listen_on(self.clone(), addr).map_err(|(_, addr)| addr)?;
83+
let fut = listener.map(|upgrade| {
84+
let fut = upgrade.map(|(out, addr)| (out, Box::new(addr) as MultiaddrFuture));
85+
Box::new(fut) as ListenerUpgrade<O>
86+
});
8587
Ok((Box::new(fut) as Box<_>, new_addr))
8688
}
8789

@@ -103,20 +105,20 @@ trait AbstractMuxed<O>: Abstract<O> {
103105
}
104106

105107
impl<T, O> AbstractMuxed<O> for T
106-
where T: MuxedTransport<Output = O> + Clone + 'static,
107-
T::Dial: Send + 'static,
108-
T::Listener: Send + 'static,
109-
T::ListenerUpgrade: Send + 'static,
110-
T::MultiaddrFuture: Send + 'static,
111-
T::Incoming: Send + 'static,
112-
T::IncomingUpgrade: Send + 'static,
108+
where
109+
T: MuxedTransport<Output = O> + Clone + 'static,
110+
T::Dial: Send + 'static,
111+
T::Listener: Send + 'static,
112+
T::ListenerUpgrade: Send + 'static,
113+
T::MultiaddrFuture: Send + 'static,
114+
T::Incoming: Send + 'static,
115+
T::IncomingUpgrade: Send + 'static,
113116
{
114117
fn next_incoming(&self) -> Incoming<O> {
115-
let fut = MuxedTransport::next_incoming(self.clone())
116-
.map(|upgrade| {
117-
let fut = upgrade.map(|(out, addr)| (out, Box::new(addr) as MultiaddrFuture));
118-
Box::new(fut) as IncomingUpgrade<O>
119-
});
118+
let fut = MuxedTransport::next_incoming(self.clone()).map(|upgrade| {
119+
let fut = upgrade.map(|(out, addr)| (out, Box::new(addr) as MultiaddrFuture));
120+
Box::new(fut) as IncomingUpgrade<O>
121+
});
120122
Box::new(fut) as Box<_>
121123
}
122124
}
@@ -152,15 +154,15 @@ impl<O> Transport for Boxed<O> {
152154
fn listen_on(self, addr: Multiaddr) -> Result<(Self::Listener, Multiaddr), (Self, Multiaddr)> {
153155
match self.inner.listen_on(addr) {
154156
Ok(listen) => Ok(listen),
155-
Err(addr) => Err((self, addr))
157+
Err(addr) => Err((self, addr)),
156158
}
157159
}
158160

159161
#[inline]
160162
fn dial(self, addr: Multiaddr) -> Result<Self::Dial, (Self, Multiaddr)> {
161163
match self.inner.dial(addr) {
162164
Ok(dial) => Ok(dial),
163-
Err(addr) => Err((self, addr))
165+
Err(addr) => Err((self, addr)),
164166
}
165167
}
166168

@@ -201,15 +203,15 @@ impl<O> Transport for BoxedMuxed<O> {
201203
fn listen_on(self, addr: Multiaddr) -> Result<(Self::Listener, Multiaddr), (Self, Multiaddr)> {
202204
match self.inner.listen_on(addr) {
203205
Ok(listen) => Ok(listen),
204-
Err(addr) => Err((self, addr))
206+
Err(addr) => Err((self, addr)),
205207
}
206208
}
207209

208210
#[inline]
209211
fn dial(self, addr: Multiaddr) -> Result<Self::Dial, (Self, Multiaddr)> {
210212
match self.inner.dial(addr) {
211213
Ok(dial) => Ok(dial),
212-
Err(addr) => Err((self, addr))
214+
Err(addr) => Err((self, addr)),
213215
}
214216
}
215217

0 commit comments

Comments
 (0)