From 2dc338dfdb964a3a3ba6b434143c29ebe4233c7e Mon Sep 17 00:00:00 2001 From: Niels Egberts Date: Mon, 8 Dec 2014 23:12:03 +0000 Subject: [PATCH] Rename assert_eq arguments to left and right. The names expected and actual are not used anymore in the output. It also removes the confusion that the argument order is the opposite of junit. --- src/libstd/macros.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 76419bee41c22..032411b51d418 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -120,14 +120,14 @@ macro_rules! assert( /// ``` #[macro_export] macro_rules! assert_eq( - ($given:expr , $expected:expr) => ({ - match (&($given), &($expected)) { - (given_val, expected_val) => { + ($left:expr , $right:expr) => ({ + match (&($left), &($right)) { + (left_val, right_val) => { // check both directions of equality.... - if !((*given_val == *expected_val) && - (*expected_val == *given_val)) { + if !((*left_val == *right_val) && + (*right_val == *left_val)) { panic!("assertion failed: `(left == right) && (right == left)` \ - (left: `{}`, right: `{}`)", *given_val, *expected_val) + (left: `{}`, right: `{}`)", *left_val, *right_val) } } }