Commit 22c5f047 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #193 from seanmonstar/rustup 

rustup: changes to io::Error
parents 121a667f 24b87652

openssl-sys/src/lib.rs

+0 −1
Original line number Diff line number Diff line 
#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]

#![allow(dead_code)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl-sys")]

#![feature(convert)]



extern crate libc;

openssl/src/bio/mod.rs

+2 −4
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ impl Read for MemBio { 
                Ok(0)

            } else {

                Err(io::Error::new(io::ErrorKind::Other,

                                   "MemBio read error",

                                   Some(format!("{:?}", SslError::get()))))

                                   SslError::get()))

            }

        } else {

            Ok(ret as usize)
@@ -89,8 +88,7 @@ impl Write for MemBio { 


        if ret < 0 {

                Err(io::Error::new(io::ErrorKind::Other,

                                   "MemBio write error",

                                   Some(format!("{:?}", SslError::get()))))

                                   SslError::get()))

        } else {

            Ok(ret as usize)

        }

openssl/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
#![feature(core, io, std_misc, unique, collections)]

#![feature(core, std_misc, unique)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/openssl")]



#[macro_use]

openssl/src/ssl/error.rs

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ use std::io; 
use ffi;



/// An SSL error

#[derive(Debug, Clone, PartialEq, Eq)]

#[derive(Debug)]

pub enum SslError {

    /// The underlying stream reported an error

    StreamError(io::Error),

openssl/src/ssl/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ impl<S: Read+Write> Read for SslStream<S> { 
            Err(SslSessionClosed) => Ok(0),

            Err(StreamError(e)) => Err(e),

            Err(e @ OpenSslErrors(_)) => {

                Err(io::Error::new(io::ErrorKind::Other, "OpenSSL error", Some(format!("{}", e))))

                Err(io::Error::new(io::ErrorKind::Other, e))

            }

        }

    }
@@ -821,7 +821,7 @@ impl<S: Read+Write> Write for SslStream<S> { 
            Err(SslSessionClosed) => Ok(0),

            Err(StreamError(e)) => return Err(e),

            Err(e @ OpenSslErrors(_)) => {

                Err(io::Error::new(io::ErrorKind::Other, "OpenSSL error", Some(format!("{}", e))))

                Err(io::Error::new(io::ErrorKind::Other, e))

            }

        }

    }