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

Renaming TCPStream to Client

Browse source
This commit is contained in:
Matt McCoy 2016-06-21 13:52:20 -04:00
parent d949de3d0b
commit f4954de642
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
example.rs
View file

@ -2,11 +2,11 @@ extern crate imap;
extern crate openssl; extern crate openssl;
use openssl::ssl::{SslContext, SslMethod}; use openssl::ssl::{SslContext, SslMethod};
use imap::client::IMAPStream; use imap::client::Client;
use imap::client::IMAPMailbox; use imap::client::IMAPMailbox;
fn main() { fn main() {
let mut imap_socket = match IMAPStream::secure_connect(("imap.gmail.com", 993), SslContext::new(SslMethod::Sslv23).unwrap()) { let mut imap_socket = match Client::secure_connect(("imap.gmail.com", 993), SslContext::new(SslMethod::Sslv23).unwrap()) {
Ok(s) => s, Ok(s) => s,
Err(e) => panic!("{}", e) Err(e) => panic!("{}", e)
}; };

20
src/client.rs
View file

@ -7,7 +7,7 @@ static TAG_PREFIX: &'static str = "a";
const INITIAL_TAG: u32 = 1; const INITIAL_TAG: u32 = 1;
/// Stream to interface with the IMAP server. This interface is only for the command stream. /// Stream to interface with the IMAP server. This interface is only for the command stream.
pub struct IMAPStream<T> { pub struct Client<T> {
stream: T, stream: T,
tag: u32 tag: u32
} }
@ -22,12 +22,12 @@ pub struct IMAPMailbox {
pub uid_validity: Option<u32> pub uid_validity: Option<u32>
} }
impl IMAPStream<TcpStream> { impl Client<TcpStream> {
/// Creates an IMAP Stream. /// Creates a new client.
pub fn connect<A: ToSocketAddrs>(addr: A) -> Result<IMAPStream<TcpStream>> { pub fn connect<A: ToSocketAddrs>(addr: A) -> Result<Client<TcpStream>> {
match TcpStream::connect(addr) { match TcpStream::connect(addr) {
Ok(stream) => { Ok(stream) => {
let mut socket = IMAPStream { stream: stream, tag: INITIAL_TAG}; let mut socket = Client { stream: stream, tag: INITIAL_TAG};
try!(socket.read_greeting()); try!(socket.read_greeting());
Ok(socket) Ok(socket)
@ -37,12 +37,12 @@ impl IMAPStream<TcpStream> {
} }
} }
impl IMAPStream<SslStream<TcpStream>> { impl Client<SslStream<TcpStream>> {
/// Creates an IMAP Stream with an Ssl wrapper. /// Creates a client with an SSL wrapper.
pub fn secure_connect<A: ToSocketAddrs>(addr: A, ssl_context: SslContext) -> Result<IMAPStream<SslStream<TcpStream>>> { pub fn secure_connect<A: ToSocketAddrs>(addr: A, ssl_context: SslContext) -> Result<Client<SslStream<TcpStream>>> {
match TcpStream::connect(addr) { match TcpStream::connect(addr) {
Ok(stream) => { Ok(stream) => {
let mut socket = IMAPStream { stream: SslStream::connect(&ssl_context, stream).unwrap(), tag: INITIAL_TAG}; let mut socket = Client { stream: SslStream::connect(&ssl_context, stream).unwrap(), tag: INITIAL_TAG};
try!(socket.read_greeting()); try!(socket.read_greeting());
Ok(socket) Ok(socket)
@ -52,7 +52,7 @@ impl IMAPStream<SslStream<TcpStream>> {
} }
} }
impl<T: Read+Write> IMAPStream<T> { impl<T: Read+Write> Client<T> {
/// Log in to the IMAP server. /// Log in to the IMAP server.
pub fn login(&mut self, username: & str, password: & str) -> Result<()> { pub fn login(&mut self, username: & str, password: & str) -> Result<()> {