From 576b12b68acc00148c90cbd71db217719b7a259f Mon Sep 17 00:00:00 2001 From: Matt McCoy Date: Thu, 14 Jul 2016 20:05:03 -0400 Subject: [PATCH] Use try! for conversion of io error to my error --- src/client.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/client.rs b/src/client.rs index 74e81b0..d56ed22 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,6 +1,6 @@ use std::net::{TcpStream, ToSocketAddrs}; use openssl::ssl::{SslContext, SslStream}; -use std::io::{self, Read, Write}; +use std::io::{Read, Write}; use super::mailbox::Mailbox; use super::authenticator::Authenticator; @@ -279,9 +279,7 @@ impl Client { let mut line_buffer: Vec = Vec::new(); while line_buffer.len() < 2 || (line_buffer[line_buffer.len()-1] != LF && line_buffer[line_buffer.len()-2] != CR) { let byte_buffer: &mut [u8] = &mut [0]; - if let Err(_) = self.stream.read(byte_buffer) { - return Err(Error::Io(io::Error::new(io::ErrorKind::Other, "Failed to read line"))); - } + try!(self.stream.read(byte_buffer)); line_buffer.push(byte_buffer[0]); } @@ -302,12 +300,8 @@ impl Client { } fn write_line(&mut self, buf: &[u8]) -> Result<()> { - if let Err(_) = self.stream.write_all(buf) { - return Err(Error::Io(io::Error::new(io::ErrorKind::Other, "Failed to write buf"))); - } - if let Err(_) = self.stream.write_all(&[CR, LF]) { - return Err(Error::Io(io::Error::new(io::ErrorKind::Other, "Failed to write CRLF"))); - } + try!(self.stream.write_all(buf)); + try!(self.stream.write_all(&[CR, LF])); if self.debug { print!("C: {}\n", String::from_utf8(buf.to_vec()).unwrap()); }