Merge pull request #280 from hyperium/rustup

Rustup

Author: seanmonstar

src/lib.rs

@@ -153,7 +153,7 @@ use self::HttpError::{HttpMethodError, HttpUriError, HttpVersionError,
 
 macro_rules! todo(
     ($($arg:tt)*) => (if cfg!(not(ndebug)) {
-        log!(5, "TODO: {:?}", format_args!($($arg)*))
+        trace!("TODO: {:?}", format_args!($($arg)*))
     })
 );
 
@@ -245,6 +245,7 @@ impl FromError<url::ParseError> for HttpError {
     }
 }
 
+#[allow(unconditional_recursion)]
 fn _assert_send<T: Send>() {
     _assert_send::<client::Request<net::Fresh>>();
     _assert_send::<client::Response>();