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/io/buffered.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/io/buffered.rs')
| -rw-r--r-- | src/libstd/io/buffered.rs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index df2a800c292..d1bd6ae13f4 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -391,21 +391,21 @@ mod test { let mut buf = [0, 0, 0]; let nread = reader.read(buf); assert_eq!(Ok(2), nread); - assert_eq!([0, 1, 0], buf); + assert_eq!(buf.as_slice(), &[0, 1, 0]); let mut buf = [0]; let nread = reader.read(buf); assert_eq!(Ok(1), nread); - assert_eq!([2], buf); + assert_eq!(buf.as_slice(), &[2]); let mut buf = [0, 0, 0]; let nread = reader.read(buf); assert_eq!(Ok(1), nread); - assert_eq!([3, 0, 0], buf); + assert_eq!(buf.as_slice(), &[3, 0, 0]); let nread = reader.read(buf); assert_eq!(Ok(1), nread); - assert_eq!([4, 0, 0], buf); + assert_eq!(buf.as_slice(), &[4, 0, 0]); assert!(reader.read(buf).is_err()); } @@ -416,35 +416,35 @@ mod test { let mut writer = BufferedWriter::with_capacity(2, inner); writer.write([0, 1]).unwrap(); - assert_eq!([], writer.get_ref().get_ref()); + assert_eq!(writer.get_ref().get_ref(), &[]); writer.write([2]).unwrap(); - assert_eq!([0, 1], writer.get_ref().get_ref()); + assert_eq!(writer.get_ref().get_ref(), &[0, 1]); writer.write([3]).unwrap(); - assert_eq!([0, 1], writer.get_ref().get_ref()); + assert_eq!(writer.get_ref().get_ref(), &[0, 1]); writer.flush().unwrap(); - assert_eq!([0, 1, 2, 3], writer.get_ref().get_ref()); + assert_eq!(&[0, 1, 2, 3], writer.get_ref().get_ref()); writer.write([4]).unwrap(); writer.write([5]).unwrap(); - assert_eq!([0, 1, 2, 3], writer.get_ref().get_ref()); + assert_eq!(&[0, 1, 2, 3], writer.get_ref().get_ref()); writer.write([6]).unwrap(); - assert_eq!([0, 1, 2, 3, 4, 5], + assert_eq!(&[0, 1, 2, 3, 4, 5], writer.get_ref().get_ref()); writer.write([7, 8]).unwrap(); - assert_eq!([0, 1, 2, 3, 4, 5, 6], + assert_eq!(&[0, 1, 2, 3, 4, 5, 6], writer.get_ref().get_ref()); writer.write([9, 10, 11]).unwrap(); - assert_eq!([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], + assert_eq!(&[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], writer.get_ref().get_ref()); writer.flush().unwrap(); - assert_eq!([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], + assert_eq!(&[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], writer.get_ref().get_ref()); } @@ -452,9 +452,9 @@ mod test { fn test_buffered_writer_inner_flushes() { let mut w = BufferedWriter::with_capacity(3, MemWriter::new()); w.write([0, 1]).unwrap(); - assert_eq!([], w.get_ref().get_ref()); + assert_eq!(&[], w.get_ref().get_ref()); let w = w.unwrap(); - assert_eq!([0, 1], w.get_ref()); + assert_eq!(&[0, 1], w.get_ref()); } // This is just here to make sure that we don't infinite loop in the @@ -495,20 +495,20 @@ mod test { fn test_line_buffer() { let mut writer = LineBufferedWriter::new(MemWriter::new()); writer.write([0]).unwrap(); - assert_eq!(writer.get_ref().get_ref(), []); + assert_eq!(writer.get_ref().get_ref(), &[]); writer.write([1]).unwrap(); - assert_eq!(writer.get_ref().get_ref(), []); + assert_eq!(writer.get_ref().get_ref(), &[]); writer.flush().unwrap(); - assert_eq!(writer.get_ref().get_ref(), [0, 1]); + assert_eq!(writer.get_ref().get_ref(), &[0, 1]); writer.write([0, '\n' as u8, 1, '\n' as u8, 2]).unwrap(); assert_eq!(writer.get_ref().get_ref(), - [0, 1, 0, '\n' as u8, 1, '\n' as u8]); + &[0, 1, 0, '\n' as u8, 1, '\n' as u8]); writer.flush().unwrap(); assert_eq!(writer.get_ref().get_ref(), - [0, 1, 0, '\n' as u8, 1, '\n' as u8, 2]); + &[0, 1, 0, '\n' as u8, 1, '\n' as u8, 2]); writer.write([3, '\n' as u8]).unwrap(); assert_eq!(writer.get_ref().get_ref(), - [0, 1, 0, '\n' as u8, 1, '\n' as u8, 2, 3, '\n' as u8]); + &[0, 1, 0, '\n' as u8, 1, '\n' as u8, 2, 3, '\n' as u8]); } #[test] |
