Reexport openssl in tokio-postgres as well

Author: sfackler

tokio-postgres/src/lib.rs

@@ -69,11 +69,6 @@ extern crate futures;
 #[cfg(unix)]
 extern crate tokio_uds;
 
-#[cfg(feature = "tokio-openssl")]
-extern crate tokio_openssl;
-#[cfg(feature = "openssl")]
-extern crate openssl;
-
 use fallible_iterator::FallibleIterator;
 use futures::{Future, IntoFuture, BoxFuture, Stream, Sink, Poll, StartSend, Async};
 use futures::future::Either;

tokio-postgres/src/test.rs

@@ -214,7 +214,7 @@ fn ssl_user_ssl_required() {
 #[cfg(feature = "with-openssl")]
 #[test]
 fn openssl_required() {
-    use openssl::ssl::{SslMethod, SslConnectorBuilder};
+    use tls::openssl::openssl::ssl::{SslMethod, SslConnectorBuilder};
     use tls::openssl::OpenSsl;
 
     let mut builder = SslConnectorBuilder::new(SslMethod::tls()).unwrap();

tokio-postgres/src/tls/openssl.rs

@@ -1,10 +1,12 @@
 //! OpenSSL support.
+extern crate tokio_openssl;
+pub extern crate openssl;
 
 use futures::{Future, BoxFuture};
-use openssl::ssl::{SslMethod, SslConnector, SslConnectorBuilder};
-use openssl::error::ErrorStack;
+use self::openssl::ssl::{SslMethod, SslConnector, SslConnectorBuilder};
+use self::openssl::error::ErrorStack;
 use std::error::Error;
-use tokio_openssl::{SslConnectorExt, SslStream};
+use self::tokio_openssl::{SslConnectorExt, SslStream};
 
 use tls::{Stream, TlsStream, Handshake};