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

76
src/stream_start.rs
View file

@ -1,6 +1,4 @@
use std::mem::replace;
// use std::error::Error as StdError;
// use std::{fmt, io};
use futures::{Future, Async, Poll, Stream, sink, Sink};
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_codec::Framed;
@ -66,22 +64,18 @@ impl<S: AsyncRead + AsyncWrite> Future for StreamStart<S> {
StreamStartState::RecvStart(mut stream) =>
match stream.poll() {
Ok(Async::Ready(Some(Packet::StreamStart(stream_attrs)))) => {
let stream_ns = match stream_attrs.get("xmlns") {
Some(ns) => ns.clone(),
None =>
return Err(ProtocolError::NoStreamNamespace.into()),
};
let stream_ns = stream_attrs.get("xmlns")
.ok_or(ProtocolError::NoStreamNamespace)?
.clone();
if self.ns == "jabber:client" {
retry = true;
// TODO: skip RecvFeatures for version < 1.0
(StreamStartState::RecvFeatures(stream, stream_ns), Ok(Async::NotReady))
} else {
let id = match stream_attrs.get("id") {
Some(id) => id.clone(),
None =>
return Err(ProtocolError::NoStreamId.into()),
};
// FIXME: huge hack, shouldn’t be an element!
let id = stream_attrs.get("id")
.ok_or(ProtocolError::NoStreamId)?
.clone();
// FIXME: huge hack, shouldn’t be an element!
let stream = XMPPStream::new(self.jid.clone(), stream, self.ns.clone(), Element::builder(id).build());
(StreamStartState::Invalid, Ok(Async::Ready(stream)))
}
@ -119,59 +113,3 @@ impl<S: AsyncRead + AsyncWrite> Future for StreamStart<S> {
}
}
}
// #[derive(Debug)]
// pub enum StreamStartError {
// MissingStreamNs,
// MissingStreamId,
// Unexpected,
// Parser(ParserError),
// IO(io::Error),
// }
// impl From<io::Error> for StreamStartError {
// fn from(e: io::Error) -> Self {
// StreamStartError::IO(e)
// }
// }
// impl From<ParserError> for StreamStartError {
// fn from(e: ParserError) -> Self {
// match e {
// ParserError::IO(e) => StreamStartError::IO(e),
// _ => StreamStartError::Parser(e)
// }
// }
// }
// impl StdError for StreamStartError {
// fn description(&self) -> &str {
// match *self {
// StreamStartError::MissingStreamNs => "Missing stream namespace",
// StreamStartError::MissingStreamId => "Missing stream id",
// StreamStartError::Unexpected => "Unexpected",
// StreamStartError::Parser(ref pe) => pe.description(),
// StreamStartError::IO(ref ie) => ie.description(),
// }
// }
// fn cause(&self) -> Option<&StdError> {
// match *self {
// StreamStartError::Parser(ref pe) => pe.cause(),
// StreamStartError::IO(ref ie) => ie.cause(),
// _ => None,
// }
// }
// }
// impl fmt::Display for StreamStartError {
// fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// match *self {
// StreamStartError::MissingStreamNs => write!(f, "Missing stream namespace"),
// StreamStartError::MissingStreamId => write!(f, "Missing stream id"),
// StreamStartError::Unexpected => write!(f, "Received unexpected data"),
// StreamStartError::Parser(ref pe) => write!(f, "{}", pe),
// StreamStartError::IO(ref ie) => write!(f, "{}", ie),
// }
// }
// }