tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-09 00:00:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: fix assert format args (#1520)

Browse Source
This commit is contained in:
Geoff Shannon
2019-08-30 14:03:37 -07:00
committed by Carl Lerche
parent d2bd6f5002
commit 383bb0a143
2 changed files with 101 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio-test/src/macros.rs
+13 -15
View File
@@ -33,13 +33,12 @@ macro_rules! assert_ready {
Pending => panic!("pending"),
}
}};
($e:expr, $($msg:tt),+) => {{
($e:expr, $($msg:tt)+) => {{
use core::task::Poll::*;
match $e {
Ready(v) => v,
Pending => {
let msg = format_args!($($msg),+);
panic!("pending; {}", msg)
panic!("pending; {}", format_args!($($msg)+))
}
}
}};
@@ -76,10 +75,10 @@ macro_rules! assert_ready_ok {
let val = assert_ready!($e);
assert_ok!(val)
}};
($e:expr, $($msg:tt),+) => {{
($e:expr, $($msg:tt)+) => {{
use tokio_test::{assert_ready, assert_ok};
let val = assert_ready!($e, $($msg),*);
assert_ok!(val, $($msg),*)
let val = assert_ready!($e, $($msg)*);
assert_ok!(val, $($msg)*)
}};
}
@@ -114,10 +113,10 @@ macro_rules! assert_ready_err {
let val = assert_ready!($e);
assert_err!(val)
}};
($e:expr, $($msg:tt),+) => {{
($e:expr, $($msg:tt)+) => {{
use tokio_test::{assert_ready, assert_err};
let val = assert_ready!($e, $($msg),*);
assert_err!(val, $($msg),*)
let val = assert_ready!($e, $($msg)*);
assert_err!(val, $($msg)*)
}};
}
@@ -155,13 +154,12 @@ macro_rules! assert_pending {
Ready(v) => panic!("ready; value = {:?}", v),
}
}};
($e:expr, $($msg:tt),+) => {{
($e:expr, $($msg:tt)+) => {{
use core::task::Poll::*;
match $e {
Pending => {}
Ready(v) => {
let msg = format_args!($($msg),+);
panic!("ready; value = {:?}; {}", v, msg)
panic!("ready; value = {:?}; {}", v, format_args!($($msg)+))
}
}
}};
@@ -198,9 +196,9 @@ macro_rules! assert_ready_eq {
assert_eq!(val, $expect)
};
($e:expr, $expect:expr, $($msg:tt),+) => {
let val = $crate::assert_ready!($e);
assert_eq!(val, $expect, $($msg),*)
($e:expr, $expect:expr, $($msg:tt)+) => {
let val = $crate::assert_ready!($e, $($msg)*);
assert_eq!(val, $expect, $($msg)*)
};
}