X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=lab1_rust%2Fsrc%2Fend_point.rs;h=97104c686e6118eec4a142a0a3ff174679208ef6;hb=9cdc634f2ce4d0e88f4d3af1d6f555a5449da189;hp=e7b0e321058de51102344abdcdeb97e99381dfcb;hpb=4d892f864a1f47eb1aab23f1c70ccb143081849c;p=crypto_lab1.git

diff --git a/lab1_rust/src/end_point.rs b/lab1_rust/src/end_point.rs
index e7b0e32..97104c6 100644
--- a/lab1_rust/src/end_point.rs
+++ b/lab1_rust/src/end_point.rs
@@ -136,7 +136,7 @@ impl Client {
          let mut m = MemWriter::new();
          match (Packet { t: Command(Packet::random_packet_data(&[42])), timestamp: timestamp }).write(&mut m, packet::Variant::Weak) {
             Err(_) => vec!(),
-            _ => m.unwrap()
+            _ => m.into_inner()
          }
       }
 
@@ -221,7 +221,7 @@ impl Client {
             let mut m = MemWriter::new();
             let raw_packet = match (Packet { t: Command(Packet::random_packet_data(&[42])), timestamp: client.end_point.current_timestamp }).write_with_padding_fun(&mut m, packet::Variant::Weak, |_, _| -> u8 { 0 }) {
                Err(_) => vec!(),
-               _ => m.unwrap()
+               _ => m.into_inner()
             };
 
             match client.end_point.send_raw_with_result(raw_packet.as_slice()) {
@@ -299,10 +299,9 @@ impl EndPoint {
 
    fn read(&mut self) -> ReadingResult {
       fn send_error(ep: &mut EndPoint, error_type: packet::ErrorType) {
-         match ep.send(Error(error_type)) {
-            Err(e) => println!("Unable to send error packet: {}", e),
-            Ok(_) => ()
-         };
+         if let Err(e) = ep.send(Error(error_type)) {
+            println!("Unable to send error packet: {}", e)
+         }
       };
 
       self.socket.set_timeout(DEFAULT_TIMEOUT);