Merge pull request #280 from hyperium/rustup

Rustup
2015-01-27 09:27:05 -08:00
parent 0a92e0d671 b002b6c3f0
commit 8ebc335b20
1 changed files with 2 additions and 1 deletions
--- a/src/lib.rs
+++ b/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>();