pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

transport, component, connection: Do not use unneeded return values

Browse source
This commit is contained in:
Maxime “pep” Buquet 2017-12-28 06:19:07 +01:00
parent 690e83725c
commit 5f9d91140d
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/component.rs
View file

@ -152,7 +152,8 @@ impl Component {
sid = value.to_owned();
}
}
}
},
_ => (),
}
break
}

8
src/connection.rs
View file

@ -29,14 +29,14 @@ impl Connection for C2S {
elem.push_attribute(("id", id));
elem.push_attribute(("xmlns", ns::CLIENT));
elem.push_attribute(("xmlns:stream", ns::STREAM));
transport.write_event(WriterEvent::Start(elem));
transport.write_event(WriterEvent::Start(elem))?;
Ok(())
}
fn close<T: Transport>(transport: &mut T) -> Result<(), Error> {
let name = "stream:stream";
let elem = BytesEnd::borrowed(name.as_bytes());
transport.write_event(WriterEvent::End(elem));
transport.write_event(WriterEvent::End(elem))?;
Ok(())
}
}
@ -56,14 +56,14 @@ impl Connection for Component2S {
elem.push_attribute(("id", id));
elem.push_attribute(("xmlns", ns::COMPONENT_ACCEPT));
elem.push_attribute(("xmlns:stream", ns::STREAM));
transport.write_event(WriterEvent::Start(elem));
transport.write_event(WriterEvent::Start(elem))?;
Ok(())
}
fn close<T: Transport>(transport: &mut T) -> Result<(), Error> {
let name = "stream:stream";
let elem = BytesEnd::borrowed(name.as_bytes());
transport.write_event(WriterEvent::End(elem));
transport.write_event(WriterEvent::End(elem))?;
Ok(())
}
}

15
src/transport.rs
View file

@ -27,7 +27,7 @@ use sasl::common::ChannelBinding;
/// A trait which transports are required to implement.
pub trait Transport {
/// Writes a `quick_xml::events::Event` to the stream.
fn write_event<'a, E: Into<Event<'a>>>(&mut self, event: E) -> Result<usize, Error>;
fn write_event<'a, E: Into<Event<'a>>>(&mut self, event: E) -> Result<(), Error>;
/// Reads a `quick_xml::events::Event` from the stream.
fn read_event(&mut self) -> Result<Event, Error>;
@ -58,8 +58,9 @@ pub struct PlainTransport {
}
impl Transport for PlainTransport {
fn write_event<'a, E: Into<Event<'a>>>(&mut self, event: E) -> Result<usize, Error> {
Ok(self.writer.write(&event.into())?)
fn write_event<'a, E: Into<Event<'a>>>(&mut self, event: E) -> Result<(), Error> {
self.writer.write(&event.into())?;
Ok(())
}
fn read_event(&mut self) -> Result<Event, Error> {
@ -124,8 +125,9 @@ pub struct SslTransport {
}
impl Transport for SslTransport {
fn write_event<'a, E: Into<Event<'a>>>(&mut self, event: E) -> Result<usize, Error> {
Ok(self.writer.write(&event.into())?)
fn write_event<'a, E: Into<Event<'a>>>(&mut self, event: E) -> Result<(), Error> {
self.writer.write(&event.into())?;
Ok(())
}
fn read_event(&mut self) -> Result<Event, Error> {
@ -179,7 +181,8 @@ impl SslTransport {
return Err(Error::StreamError);
}
}
}
},
_ => (),
}
}
}