Skip to content

Commit 1a6ef3d

Browse files
eopbeopb
committed
Make expect_that! more hygienic
related #475 I went for using fully qualified method names, rather than `use $crate::GoogleTestSupport as _;` since it's more hygienic. `use $crate::GoogleTestSupport as _;` can cause issues, resulting in a conflict, if the user introduces another method with the same name as one on `GoogleTestSupport`
1 parent fb92909 commit 1a6ef3d

File tree

1 file changed

+46
-75
lines changed

1 file changed

+46
-75
lines changed

‎googletest/src/assertions.rs‎

Lines changed: 46 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,10 @@ pub use succeed;
370370
#[macro_export]
371371
macro_rules! add_failure {
372372
($($message:expr),+ $(,)?) => {{
373-
use $crate::GoogleTestSupport as _;
373+
$crate::GoogleTestSupport::and_log_failure(
374374
$crate::assertions::internal::create_fail_result(
375375
format!($($message),*),
376-
).and_log_failure();
376+
));
377377
}};
378378

379379
() => {
@@ -419,10 +419,10 @@ pub use add_failure;
419419
#[macro_export]
420420
macro_rules! add_failure_at {
421421
($file:expr, $line:expr, $column:expr, $($message:expr),+ $(,)?) => {{
422-
use $crate::GoogleTestSupport as _;
422+
$crate::GoogleTestSupport::and_log_failure(
423423
$crate::assertions::internal::create_fail_result(
424424
format!($($message),*),
425-
).map_err(|e| e.with_fake_location($file, $line, $column)).and_log_failure();
425+
).map_err(|e| e.with_fake_location($file, $line, $column)));
426426
}};
427427

428428
($file:expr, $line:expr, $column:expr $(,)?) => {
@@ -487,8 +487,7 @@ pub use verify_true;
487487
#[macro_export]
488488
macro_rules! expect_true {
489489
($condition:expr) => {{
490-
use $crate::GoogleTestSupport as _;
491-
$crate::verify_true!($condition).and_log_failure()
490+
$crate::GoogleTestSupport::and_log_failure($crate::verify_true!($condition))
492491
}};
493492
}
494493
pub use expect_true;
@@ -549,8 +548,7 @@ pub use verify_false;
549548
#[macro_export]
550549
macro_rules! expect_false {
551550
($condition:expr) => {{
552-
use $crate::GoogleTestSupport as _;
553-
$crate::verify_false!($condition).and_log_failure()
551+
$crate::GoogleTestSupport::and_log_failure(($crate::verify_false!($condition)))
554552
}};
555553
}
556554
pub use expect_false;
@@ -674,34 +672,28 @@ pub use verify_eq;
674672
#[macro_export]
675673
macro_rules! expect_eq {
676674
($actual:expr, [$($expected:expr),+ $(,)?] $(,)?) => {{
677-
use $crate::GoogleTestSupport as _;
678-
$crate::verify_eq!($actual, [$($expected),*]).and_log_failure();
675+
$crate::GoogleTestSupport::and_log_failure($crate::verify_eq!($actual, [$($expected),*]));
679676
}};
680677
($actual:expr, [$($expected:expr),+ $(,)?], $($format_args:expr),* $(,)?) => {{
681-
use $crate::GoogleTestSupport as _;
682-
$crate::verify_eq!($actual, [$($expected),*])
678+
$crate::GoogleTestSupport::and_log_failure($crate::verify_eq!($actual, [$($expected),*])
683679
.with_failure_message(|| format!($($format_args),*))
684-
.and_log_failure();
680+
);
685681
}};
686682
($actual:expr, {$($expected:expr),+ $(,)?} $(,)?) => {{
687-
use $crate::GoogleTestSupport as _;
688-
$crate::verify_eq!($actual, {$($expected),*}).and_log_failure();
683+
$crate::GoogleTestSupport::and_log_failure($crate::verify_eq!($actual, {$($expected),*}));
689684
}};
690685
($actual:expr, {$($expected:expr),+ $(,)?}, $($format_args:expr),* $(,)?) => {{
691-
use $crate::GoogleTestSupport as _;
692-
$crate::verify_eq!($actual, {$($expected),*})
686+
$crate::GoogleTestSupport::and_log_failure($crate::verify_eq!($actual, {$($expected),*})
693687
.with_failure_message(|| format!($($format_args),*))
694-
.and_log_failure();
688+
);
695689
}};
696690
($actual:expr, $expected:expr $(,)?) => {{
697-
use $crate::GoogleTestSupport as _;
698-
$crate::verify_eq!($actual, $expected).and_log_failure();
691+
$crate::GoogleTestSupport::and_log_failure($crate::verify_eq!($actual, $expected));
699692
}};
700693
($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {{
701-
use $crate::GoogleTestSupport as _;
702-
$crate::verify_eq!($actual, $expected)
694+
$crate::GoogleTestSupport::and_log_failure($crate::verify_eq!($actual, $expected)
703695
.with_failure_message(|| format!($($format_args),*))
704-
.and_log_failure();
696+
);
705697
}};
706698
}
707699
pub use expect_eq;
@@ -774,14 +766,12 @@ pub use verify_ne;
774766
#[macro_export]
775767
macro_rules! expect_ne {
776768
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
777-
use $crate::GoogleTestSupport as _;
778-
$crate::verify_ne!($actual, $expected)
769+
$crate::GoogleTestSupport::and_log_failure($crate::verify_ne!($actual, $expected)
779770
.with_failure_message(|| format!($($format_args),*))
780-
.and_log_failure();
771+
);
781772
}};
782773
($actual:expr, $expected:expr $(,)?) => {{
783-
use $crate::GoogleTestSupport as _;
784-
$crate::verify_ne!($actual, $expected).and_log_failure();
774+
$crate::GoogleTestSupport::and_log_failure($crate::verify_ne!($actual, $expected));
785775
}};
786776
}
787777
pub use expect_ne;
@@ -854,14 +844,12 @@ pub use verify_lt;
854844
#[macro_export]
855845
macro_rules! expect_lt {
856846
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
857-
use $crate::GoogleTestSupport as _;
858-
$crate::verify_lt!($actual, $expected)
847+
$crate::GoogleTestSupport::and_log_failure($crate::verify_lt!($actual, $expected)
859848
.with_failure_message(|| format!($($format_args),*))
860-
.and_log_failure();
849+
);
861850
}};
862851
($actual:expr, $expected:expr $(,)?) => {{
863-
use $crate::GoogleTestSupport as _;
864-
$crate::verify_lt!($actual, $expected).and_log_failure();
852+
$crate::GoogleTestSupport::and_log_failure($crate::verify_lt!($actual, $expected));
865853
}};
866854
}
867855
pub use expect_lt;
@@ -935,14 +923,12 @@ pub use verify_le;
935923
#[macro_export]
936924
macro_rules! expect_le {
937925
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
938-
use $crate::GoogleTestSupport as _;
939-
$crate::verify_le!($actual, $expected)
926+
$crate::GoogleTestSupport::and_log_failure($crate::verify_le!($actual, $expected)
940927
.with_failure_message(|| format!($($format_args),*))
941-
.and_log_failure();
928+
);
942929
}};
943930
($actual:expr, $expected:expr $(,)?) => {{
944-
use $crate::GoogleTestSupport as _;
945-
$crate::verify_le!($actual, $expected).and_log_failure();
931+
$crate::GoogleTestSupport::and_log_failure($crate::verify_le!($actual, $expected));
946932
}};
947933
}
948934
pub use expect_le;
@@ -1015,14 +1001,12 @@ pub use verify_gt;
10151001
#[macro_export]
10161002
macro_rules! expect_gt {
10171003
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
1018-
use $crate::GoogleTestSupport as _;
1019-
$crate::verify_gt!($actual, $expected)
1004+
$crate::GoogleTestSupport::and_log_failure($crate::verify_gt!($actual, $expected)
10201005
.with_failure_message(|| format!($($format_args),*))
1021-
.and_log_failure();
1006+
);
10221007
}};
10231008
($actual:expr, $expected:expr $(,)?) => {{
1024-
use $crate::GoogleTestSupport as _;
1025-
$crate::verify_gt!($actual, $expected).and_log_failure();
1009+
$crate::GoogleTestSupport::and_log_failure($crate::verify_gt!($actual, $expected));
10261010
}};
10271011
}
10281012
pub use expect_gt;
@@ -1097,14 +1081,12 @@ pub use verify_ge;
10971081
#[macro_export]
10981082
macro_rules! expect_ge {
10991083
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
1100-
use $crate::GoogleTestSupport as _;
1101-
$crate::verify_ge!($actual, $expected)
1084+
$crate::GoogleTestSupport::and_log_failure($crate::verify_ge!($actual, $expected)
11021085
.with_failure_message(|| format!($($format_args),*))
1103-
.and_log_failure();
1086+
);
11041087
}};
11051088
($actual:expr, $expected:expr $(,)?) => {{
1106-
use $crate::GoogleTestSupport as _;
1107-
$crate::verify_ge!($actual, $expected).and_log_failure();
1089+
$crate::GoogleTestSupport::and_log_failure($crate::verify_ge!($actual, $expected));
11081090
}};
11091091
}
11101092
pub use expect_ge;
@@ -1194,14 +1176,12 @@ pub use verify_float_eq;
11941176
#[macro_export]
11951177
macro_rules! expect_float_eq {
11961178
($actual:expr, $expected:expr, $($format_args:expr),+ $(,)?) => {{
1197-
use $crate::GoogleTestSupport as _;
1198-
$crate::verify_float_eq!($actual, $expected)
1179+
$crate::GoogleTestSupport::and_log_failure($crate::verify_float_eq!($actual, $expected)
11991180
.with_failure_message(|| format!($($format_args),*))
1200-
.and_log_failure();
1181+
);
12011182
}};
12021183
($actual:expr, $expected:expr $(,)?) => {{
1203-
use $crate::GoogleTestSupport as _;
1204-
$crate::verify_float_eq!($actual, $expected).and_log_failure();
1184+
$crate::GoogleTestSupport::and_log_failure($crate::verify_float_eq!($actual, $expected));
12051185
}};
12061186
}
12071187
pub use expect_float_eq;
@@ -1277,14 +1257,12 @@ pub use verify_near;
12771257
#[macro_export]
12781258
macro_rules! expect_near {
12791259
($actual:expr, $expected:expr, $max_abs_error:expr, $($format_args:expr),+ $(,)?) => {{
1280-
use $crate::GoogleTestSupport as _;
1281-
$crate::verify_near!($actual, $expected, $max_abs_error)
1260+
$crate::GoogleTestSupport::and_log_failure($crate::verify_near!($actual, $expected, $max_abs_error)
12821261
.with_failure_message(|| format!($($format_args),*))
1283-
.and_log_failure();
1262+
);
12841263
}};
12851264
($actual:expr, $expected:expr, $max_abs_error:expr $(,)?) => {{
1286-
use $crate::GoogleTestSupport as _;
1287-
$crate::verify_near!($actual, $expected, $max_abs_error).and_log_failure();
1265+
$crate::GoogleTestSupport::and_log_failure($crate::verify_near!($actual, $expected, $max_abs_error));
12881266
}};
12891267
}
12901268
pub use expect_near;
@@ -1483,44 +1461,38 @@ pub use assert_pred;
14831461
macro_rules! expect_that {
14841462
// specialized to sequence:
14851463
($actual:expr, [$($expected:expr),*] $(,)?) => {{
1486-
use $crate::GoogleTestSupport as _;
1487-
$crate::verify_that!($actual, [$($expected),*]).and_log_failure();
1464+
$crate::GoogleTestSupport::and_log_failure($crate::verify_that!($actual, [$($expected),*]));
14881465
}};
14891466

14901467
// specialized to unordered sequence:
14911468
($actual:expr, {$($expected:expr),*} $(,)?) => {{
1492-
use $crate::GoogleTestSupport as _;
1493-
$crate::verify_that!($actual, {$($expected),*}).and_log_failure();
1469+
$crate::GoogleTestSupport::and_log_failure($crate::verify_that!($actual, {$($expected),*}));
14941470
}};
14951471

14961472
// w/ format args, specialized to sequence:
14971473
($actual:expr, [$($expected:expr),*], $($format_args:expr),* $(,)?) => {
1498-
use $crate::GoogleTestSupport as _;
1499-
$crate::verify_that!($actual, [$($expected),*])
1474+
$crate::GoogleTestSupport::and_log_failure($crate::verify_that!($actual, [$($expected),*])
15001475
.with_failure_message(|| format!($($format_args),*))
1501-
.and_log_failure()
1476+
)
15021477
};
15031478

15041479
// w/ format args, specialized to unordered sequence:
15051480
($actual:expr, {$($expected:expr),*}, $($format_args:expr),* $(,)?) => {
1506-
use $crate::GoogleTestSupport as _;
1507-
$crate::verify_that!($actual, {$($expected),*})
1481+
$crate::GoogleTestSupport::and_log_failure($crate::verify_that!($actual, {$($expected),*})
15081482
.with_failure_message(|| format!($($format_args),*))
1509-
.and_log_failure()
1483+
)
15101484
};
15111485

15121486
// general case:
15131487
($actual:expr, $expected:expr $(,)?) => {{
1514-
use $crate::GoogleTestSupport as _;
1515-
$crate::verify_that!($actual, $expected).and_log_failure();
1488+
$crate::GoogleTestSupport::and_log_failure($crate::verify_that!($actual, $expected));
15161489
}};
15171490

15181491
// w/ format args, general case:
15191492
($actual:expr, $expected:expr, $($format_args:expr),* $(,)?) => {
1520-
use $crate::GoogleTestSupport as _;
1521-
$crate::verify_that!($actual, $expected)
1493+
$crate::GoogleTestSupport::and_log_failure($crate::verify_that!($actual, $expected)
15221494
.with_failure_message(|| format!($($format_args),*))
1523-
.and_log_failure()
1495+
)
15241496
};
15251497
}
15261498
pub use expect_that;
@@ -1544,8 +1516,7 @@ pub use expect_that;
15441516
#[macro_export]
15451517
macro_rules! expect_pred {
15461518
($($content:tt)*) => {{
1547-
use $crate::GoogleTestSupport as _;
1548-
$crate::verify_pred!($($content)*).and_log_failure();
1519+
$crate::GoogleTestSupport::and_log_failure($crate::verify_pred!($($content)*));
15491520
}};
15501521
}
15511522
pub use expect_pred;

0 commit comments

Comments
 (0)