Replace cfg-based SSL with Cargo features.

rustc --cfg nossl => cargo build --no-default-features

Author: chris-morgan

Cargo.toml

@@ -4,12 +4,17 @@ version = "0.1.0-pre"
 authors = [ "Chris Morgan <[email protected]>" ]
 build = "codegen/main.rs"
 
+[features]
+default = ["ssl"]
+ssl = ["openssl"]
+
 [lib]
 name = "http"
 path = "src/http/lib.rs"
 
 [dependencies.openssl]
 git = "https://github.com/sfackler/rust-openssl.git"
+optional = true
 
 [dependencies.url]
 git = "https://github.com/servo/rust-url"

src/http/client/sslclients/mod.rs

@@ -5,12 +5,12 @@
 //! that, you won't be able to use SSL (an attempt to make an HTTPS connection
 //! will return an error).
 
-#[cfg(not(nossl))]
+#[cfg(feature = "ssl")]
 pub use self::openssl::NetworkStream;
-#[cfg(nossl)]
+#[cfg(not(feature = "ssl"))]
 pub use self::none::NetworkStream;
 
-#[cfg(not(nossl))]
+#[cfg(feature = "ssl")]
 mod openssl;
-#[cfg(nossl)]
+#[cfg(not(feature = "ssl"))]
 mod none;

src/http/client/sslclients/none.rs

@@ -4,6 +4,7 @@ use std::io::net::ip::SocketAddr;
 use std::io::net::tcp::TcpStream;
 use std::io::{IoResult, IoError, InvalidInput};
 use connecter::Connecter;
+use self::NetworkStream::NormalStream;
 
 /// A TCP stream, plain text and with no SSL support.
 ///

src/http/client/sslclients/openssl.rs

@@ -1,5 +1,6 @@
 //! SSL support provided by OpenSSL.
 
+#[cfg(any(feature = "ssl", feature = "default"))]
 extern crate openssl;
 
 use std::io::net::ip::SocketAddr;