rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

std: use a match in assert_eq! to extend the lifetime of the args.

Browse Source 
This enables

    assert_eq!(foo.collect::<Vec<...>>().as_slice(), &[1,2,3,4]);

to work, by extending the lifetime of the .as_slice() rvalue.
This commit is contained in:
Huon Wilson
2014-04-07 22:32:49 +10:00
parent 8801d891c4
commit d3c831ba4a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/macros.rs
View File

@@ -117,13 +117,15 @@ macro_rules! assert(
#[macro_export] #[macro_export]
macro_rules! assert_eq( macro_rules! assert_eq(
($given:expr , $expected:expr) => ({ ($given:expr , $expected:expr) => ({
let given_val = &($given); match (&($given), &($expected)) {
let expected_val = &($expected); (given_val, expected_val) => {
// check both directions of equality.... // check both directions of equality....
if !((*given_val == *expected_val) && if !((*given_val == *expected_val) &&
(*expected_val == *given_val)) { (*expected_val == *given_val)) {
fail!("assertion failed: `(left == right) && (right == left)` \ fail!("assertion failed: `(left == right) && (right == left)` \
(left: `{}`, right: `{}`)", *given_val, *expected_val) (left: `{}`, right: `{}`)", *given_val, *expected_val)
}
}
} }
}) })
) )