From 02882fbd7edcb8d0d152afcdc8571216efcbd664 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 28 Feb 2014 01:23:06 -0800 Subject: std: Change assert_eq!() to use {} instead of {:?} Formatting via reflection has been a little questionable for some time now, and it's a little unfortunate that one of the standard macros will silently use reflection when you weren't expecting it. This adds small bits of code bloat to libraries, as well as not always being necessary. In light of this information, this commit switches assert_eq!() to using {} in the error message instead of {:?}. In updating existing code, there were a few error cases that I encountered: * It's impossible to define Show for [T, ..N]. I think DST will alleviate this because we can define Show for [T]. * A few types here and there just needed a #[deriving(Show)] * Type parameters needed a Show bound, I often moved this to `assert!(a == b)` * `Path` doesn't implement `Show`, so assert_eq!() cannot be used on two paths. I don't think this is much of a regression though because {:?} on paths looks awful (it's a byte array). Concretely speaking, this shaved 10K off a 656K binary. Not a lot, but sometime significant for smaller binaries. --- src/libstd/num/mod.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/num') diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index 104543d4323..2051eeef60c 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -295,7 +295,7 @@ pub fn checked_next_power_of_two(n: T) -> Option { } /// Used for representing the classification of floating point numbers -#[deriving(Eq)] +#[deriving(Eq, Show)] pub enum FPCategory { /// "Not a Number", often obtained by dividing by zero FPNaN, @@ -1075,7 +1075,7 @@ pub trait CheckedDiv: Div { /// Helper function for testing numeric operations #[cfg(test)] -pub fn test_num(ten: T, two: T) { +pub fn test_num(ten: T, two: T) { assert_eq!(ten.add(&two), cast(12).unwrap()); assert_eq!(ten.sub(&two), cast(8).unwrap()); assert_eq!(ten.mul(&two), cast(20).unwrap()); @@ -1650,7 +1650,7 @@ mod tests { test_checked_next_power_of_two!(test_checked_next_power_of_two_u64, u64) test_checked_next_power_of_two!(test_checked_next_power_of_two_uint, uint) - #[deriving(Eq)] + #[deriving(Eq, Show)] struct Value { x: int } impl ToPrimitive for Value { -- cgit 1.4.1-3-g733a5