sander/rust-imap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use try! for conversion of io error to my error

Browse source
This commit is contained in:
Matt McCoy 2016-07-14 20:05:03 -04:00
parent 75410ed5b5
commit 576b12b68a
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client.rs
View file

@ -1,6 +1,6 @@
use std::net::{TcpStream, ToSocketAddrs}; use std::net::{TcpStream, ToSocketAddrs};
use openssl::ssl::{SslContext, SslStream}; use openssl::ssl::{SslContext, SslStream};
use std::io::{self, Read, Write}; use std::io::{Read, Write};
use super::mailbox::Mailbox; use super::mailbox::Mailbox;
use super::authenticator::Authenticator; use super::authenticator::Authenticator;
@ -279,9 +279,7 @@ impl<T: Read+Write> Client<T> {
let mut line_buffer: Vec<u8> = Vec::new(); let mut line_buffer: Vec<u8> = Vec::new();
while line_buffer.len() < 2 || (line_buffer[line_buffer.len()-1] != LF && line_buffer[line_buffer.len()-2] != CR) { 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]; let byte_buffer: &mut [u8] = &mut [0];
if let Err(_) = self.stream.read(byte_buffer) { try!(self.stream.read(byte_buffer));
return Err(Error::Io(io::Error::new(io::ErrorKind::Other, "Failed to read line")));
}
line_buffer.push(byte_buffer[0]); line_buffer.push(byte_buffer[0]);
} }
@ -302,12 +300,8 @@ impl<T: Read+Write> Client<T> {
} }
fn write_line(&mut self, buf: &[u8]) -> Result<()> { fn write_line(&mut self, buf: &[u8]) -> Result<()> {
if let Err(_) = self.stream.write_all(buf) { try!(self.stream.write_all(buf));
return Err(Error::Io(io::Error::new(io::ErrorKind::Other, "Failed to write buf"))); try!(self.stream.write_all(&[CR, LF]));
}
if let Err(_) = self.stream.write_all(&[CR, LF]) {
return Err(Error::Io(io::Error::new(io::ErrorKind::Other, "Failed to write CRLF")));
}
if self.debug { if self.debug {
print!("C: {}\n", String::from_utf8(buf.to_vec()).unwrap()); print!("C: {}\n", String::from_utf8(buf.to_vec()).unwrap());
} }