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

37
src/client/auth.rs
View file

@ -40,33 +40,26 @@ impl<S: AsyncWrite> ClientAuth<S> {
];
let mech_names: Vec<String> =
match stream.stream_features.get_child("mechanisms", NS_XMPP_SASL) {
None =>
return Err(AuthError::NoMechanism.into()),
Some(mechs) =>
mechs.children()
.filter(|child| child.is("mechanism", NS_XMPP_SASL))
.map(|mech_el| mech_el.text())
.collect(),
};
stream.stream_features.get_child("mechanisms", NS_XMPP_SASL)
.ok_or(AuthError::NoMechanism)?
.children()
.filter(|child| child.is("mechanism", NS_XMPP_SASL))
.map(|mech_el| mech_el.text())
.collect();
// println!("SASL mechanisms offered: {:?}", mech_names);
for mut mech in mechs {
let name = mech.name().to_owned();
if mech_names.iter().any(|name1| *name1 == name) {
// println!("SASL mechanism selected: {:?}", name);
let initial = match mech.initial() {
Ok(initial) => initial,
Err(e) => return Err(AuthError::Sasl(e).into()),
};
let initial = mech.initial()
.map_err(AuthError::Sasl)?;
let mut this = ClientAuth {
state: ClientAuthState::Invalid,
mechanism: mech,
};
let mechanism = match XMPPMechanism::from_str(&name) {
Ok(mechanism) => mechanism,
Err(e) => return Err(ProtocolError::Parsers(e).into()),
};
let mechanism = XMPPMechanism::from_str(&name)
.map_err(ProtocolError::Parsers)?;
this.send(
stream,
Auth {
@ -78,7 +71,7 @@ impl<S: AsyncWrite> ClientAuth<S> {
}
}
Err(AuthError::NoMechanism.into())
Err(AuthError::NoMechanism)?
}
fn send<N: Into<Element>>(&mut self, stream: XMPPStream<S>, nonza: N) {
@ -107,7 +100,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientAuth<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into()),
Err(e)?,
},
ClientAuthState::WaitRecv(mut stream) =>
match stream.poll() {
@ -122,7 +115,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientAuth<S> {
self.state = ClientAuthState::Start(start);
self.poll()
} else if let Ok(failure) = Failure::try_from(stanza) {
Err(AuthError::Fail(failure.defined_condition).into())
Err(AuthError::Fail(failure.defined_condition))?
} else {
Ok(Async::NotReady)
}
@ -136,7 +129,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientAuth<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(ProtocolError::Parser(e).into())
Err(ProtocolError::Parser(e))?
},
ClientAuthState::Start(mut start) =>
match start.poll() {
@ -147,7 +140,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientAuth<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into())
Err(e)
},
ClientAuthState::Invalid =>
unreachable!(),

6
src/client/bind.rs
View file

@ -61,7 +61,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientBind<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into())
Err(e)?
}
},
ClientBind::WaitRecv(mut stream) => {
@ -80,7 +80,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientBind<S> {
Ok(Async::Ready(stream))
},
_ =>
Err(ProtocolError::InvalidBindResponse.into()),
Err(ProtocolError::InvalidBindResponse)?,
}
} else {
Ok(Async::NotReady)
@ -96,7 +96,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientBind<S> {
Ok(Async::NotReady)
},
Err(e) =>
Err(e.into()),
Err(e)?,
}
},
ClientBind::Invalid =>

6
src/client/mod.rs
View file

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