xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve style

Browse source
This commit is contained in:
Astro 2018-09-06 23:57:42 +02:00
commit f4007511ea
7 changed files with 37 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/component/auth.rs
View file

@ -31,7 +31,7 @@ impl<S: AsyncWrite> ComponentAuth<S> {
stream,
Handshake::from_password_and_stream_id(&password, &sid)
);
return Ok(this);
Ok(this)
}
fn send(&mut self, stream: XMPPStream<S>, handshake: Handshake) {
@ -61,7 +61,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ComponentAuth<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into()),
Err(e)?
},
ComponentAuthState::WaitRecv(mut stream) =>
match stream.poll() {
@ -85,7 +85,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ComponentAuth<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into()),
Err(e)?
},
ComponentAuthState::Invalid =>
unreachable!(),

6
src/component/mod.rs
View file

@ -100,7 +100,7 @@ impl Stream for Component {
Ok(Async::NotReady) => (),
Ok(Async::Ready(())) => (),
Err(e) =>
return Err(e.into()),
return Err(e)?,
};
// Poll stream
@ -123,7 +123,7 @@ impl Stream for Component {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into()),
Err(e)?,
}
},
}
@ -146,7 +146,7 @@ impl Sink for Component {
Ok(AsyncSink::Ready)
},
Err(e) =>
Err(e.into()),
Err(e)?,
},
_ =>
Ok(AsyncSink::NotReady(item)),