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

Maxime “pep” Buquet created 8 years ago

Change summary

src/component.rs  |  3 ++-
src/connection.rs |  8 ++++----
src/transport.rs  | 15 +++++++++------
3 files changed, 15 insertions(+), 11 deletions(-)

Detailed changes

src/component.rs

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

src/connection.rs

@@ -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(())
     }
 }

src/transport.rs

@@ -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);
                             }
                         }
-                    }
+                    },
+                    _ => (),
                 }
             }
         }