Only expose one error type in crate root
This commit is contained in:
parent
2358c8636e
commit
34796c90d4
8 changed files with 14 additions and 9 deletions
|
|
@ -27,6 +27,7 @@ use tokio::{
|
|||
};
|
||||
use xmpp_parsers::{jid::Jid, ns};
|
||||
|
||||
use crate::error::ProtocolError;
|
||||
use crate::{connect::ServerConnector, xmpp_codec::Packet, AsyncClient, SimpleClient};
|
||||
use crate::{connect::ServerConnectorError, xmpp_stream::XMPPStream};
|
||||
|
||||
|
|
@ -80,7 +81,7 @@ impl ServerConnector for ServerConfig {
|
|||
// Encrypted XMPPStream
|
||||
Ok(XMPPStream::start(tls_stream, jid.clone(), ns.to_owned()).await?)
|
||||
} else {
|
||||
return Err(crate::Error::Protocol(crate::ProtocolError::NoTls).into());
|
||||
return Err(crate::Error::Protocol(ProtocolError::NoTls).into());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +160,7 @@ pub async fn starttls<S: AsyncRead + AsyncWrite + Unpin>(
|
|||
Some(Ok(Packet::Text(_))) => {}
|
||||
Some(Err(e)) => return Err(e.into()),
|
||||
_ => {
|
||||
return Err(crate::Error::Protocol(crate::ProtocolError::NoTls).into());
|
||||
return Err(crate::Error::Protocol(ProtocolError::NoTls).into());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue