Merge pull request #280 from hyperium/rustup

Rustup
This commit is contained in:
Sean McArthur
2015-01-27 09:27:05 -08:00

View File

@@ -153,7 +153,7 @@ use self::HttpError::{HttpMethodError, HttpUriError, HttpVersionError,
macro_rules! todo( macro_rules! todo(
($($arg:tt)*) => (if cfg!(not(ndebug)) { ($($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>() { fn _assert_send<T: Send>() {
_assert_send::<client::Request<net::Fresh>>(); _assert_send::<client::Request<net::Fresh>>();
_assert_send::<client::Response>(); _assert_send::<client::Response>();