diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-28 01:23:06 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-28 23:01:54 -0800 |
| commit | 02882fbd7edcb8d0d152afcdc8571216efcbd664 (patch) | |
| tree | ab893c74b3fdd3d58394e8dd9d74561adfe3326b /src/libstd/str.rs | |
| parent | 123eb4ebea695f724a2375a73db53b91273e5ce0 (diff) | |
| download | rust-02882fbd7edcb8d0d152afcdc8571216efcbd664.tar.gz rust-02882fbd7edcb8d0d152afcdc8571216efcbd664.zip | |
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.
Diffstat (limited to 'src/libstd/str.rs')
| -rw-r--r-- | src/libstd/str.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 12044b4a06a..5131c684795 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -858,7 +858,7 @@ pub struct UTF16Items<'a> { priv iter: vec::Items<'a, u16> } /// The possibilities for values decoded from a `u16` stream. -#[deriving(Eq, TotalEq, Clone)] +#[deriving(Eq, TotalEq, Clone, Show)] pub enum UTF16Item { /// A valid codepoint. ScalarValue(char), @@ -3743,7 +3743,7 @@ mod tests { ]; assert_eq!("".as_bytes(), &[]); assert_eq!("abc".as_bytes(), &['a' as u8, 'b' as u8, 'c' as u8]); - assert_eq!("ศไทย中华Việt Nam".as_bytes(), v); + assert_eq!("ศไทย中华Việt Nam".as_bytes(), v.as_slice()); } #[test] @@ -4442,11 +4442,11 @@ mod tests { assert!(o.lt(&Slice("bcdef"))); assert_eq!(Owned(~""), Default::default()); - assert_eq!(s.cmp(&o), Equal); + assert!(s.cmp(&o) == Equal); assert!(s.equals(&o)); assert!(s.equiv(&o)); - assert_eq!(o.cmp(&s), Equal); + assert!(o.cmp(&s) == Equal); assert!(o.equals(&s)); assert!(o.equiv(&s)); } |
