diff --git a/src/jpeg.rs b/src/jpeg.rs index d5fc36e..26de775 100644 --- a/src/jpeg.rs +++ b/src/jpeg.rs @@ -108,7 +108,6 @@ pub fn is_jpeg(buf: &[u8]) -> bool { #[cfg(test)] mod tests { - use std::io::Cursor; use super::*; #[test] @@ -122,12 +121,12 @@ mod tests { b"\xff\xd8\xff\xe1\x00\x08\x03\x04", ]; for &data in sets { - assert_err_pat!(get_exif_attr(&mut Cursor::new(data)), + assert_err_pat!(get_exif_attr(&mut &data[..]), Error::InvalidFormat("Broken JPEG file")); } let mut data = b"\xff\xd8\xff\xe1\x00\x08Exif\0\0".to_vec(); - get_exif_attr(&mut Cursor::new(&data)).unwrap(); + get_exif_attr(&mut &data[..]).unwrap(); while let Some(_) = data.pop() { get_exif_attr(&mut &data[..]).unwrap_err(); } @@ -136,26 +135,26 @@ mod tests { #[test] fn no_exif() { let data = b"\xff\xd8\xff\xd9"; - assert_err_pat!(get_exif_attr(&mut Cursor::new(data)), + assert_err_pat!(get_exif_attr(&mut &data[..]), Error::NotFound(_)); } #[test] fn out_of_sync() { let data = b"\xff\xd8\x01\x02\x03\xff\x00\xff\xd9"; - assert_err_pat!(get_exif_attr(&mut Cursor::new(data)), + assert_err_pat!(get_exif_attr(&mut &data[..]), Error::NotFound(_)); } #[test] fn empty() { let data = b"\xff\xd8\xff\xe1\x00\x08Exif\0\0\xff\xd9"; - assert_ok!(get_exif_attr(&mut Cursor::new(data)), []); + assert_ok!(get_exif_attr(&mut &data[..]), []); } #[test] fn non_empty() { let data = b"\xff\xd8\xff\xe1\x00\x0aExif\0\0\xbe\xad\xff\xd9"; - assert_ok!(get_exif_attr(&mut Cursor::new(data)), [0xbe, 0xad]); + assert_ok!(get_exif_attr(&mut &data[..]), [0xbe, 0xad]); } } diff --git a/src/png.rs b/src/png.rs index 2657eb4..4e2557e 100644 --- a/src/png.rs +++ b/src/png.rs @@ -87,7 +87,6 @@ pub fn is_png(buf: &[u8]) -> bool { #[cfg(test)] mod tests { - use std::io::Cursor; use super::*; #[test] @@ -98,12 +97,12 @@ mod tests { b"\x89PNG\x0d\x0a\x1a", ]; for &data in sets { - assert_err_pat!(get_exif_attr(&mut Cursor::new(data)), + assert_err_pat!(get_exif_attr(&mut &data[..]), Error::InvalidFormat("Broken PNG file")); } let mut data = b"\x89PNG\x0d\x0a\x1a\x0a\0\0\0\x04eXIfExif".to_vec(); - get_exif_attr(&mut Cursor::new(&data)).unwrap(); + get_exif_attr(&mut &data[..]).unwrap(); while let Some(_) = data.pop() { get_exif_attr(&mut &data[..]).unwrap_err(); } @@ -112,19 +111,19 @@ mod tests { #[test] fn no_exif() { let data = b"\x89PNG\x0d\x0a\x1a\x0a"; - assert_err_pat!(get_exif_attr(&mut Cursor::new(data)), + assert_err_pat!(get_exif_attr(&mut &data[..]), Error::NotFound(_)); } #[test] fn empty() { let data = b"\x89PNG\x0d\x0a\x1a\x0a\0\0\0\0eXIfCRC_"; - assert_ok!(get_exif_attr(&mut Cursor::new(data)), []); + assert_ok!(get_exif_attr(&mut &data[..]), []); } #[test] fn non_empty() { let data = b"\x89PNG\x0d\x0a\x1a\x0a\0\0\0\x02eXIf\xbe\xadCRC_"; - assert_ok!(get_exif_attr(&mut Cursor::new(data)), [0xbe, 0xad]); + assert_ok!(get_exif_attr(&mut &data[..]), [0xbe, 0xad]); } } diff --git a/src/util.rs b/src/util.rs index e5dd0e4..1a8485c 100644 --- a/src/util.rs +++ b/src/util.rs @@ -94,18 +94,18 @@ pub fn ctou32(c: u8) -> Result { #[cfg(test)] mod tests { - use std::io::Cursor; use std::io::ErrorKind; use std::io::Read; use super::*; #[test] fn read8_len() { - let mut reader = Cursor::new([]); - assert_err_kind!(read8(&mut reader), ErrorKind::UnexpectedEof); - let mut reader = Cursor::new([0x01]); - assert_ok!(read8(&mut reader), 0x01); - let mut reader = Cursor::new([0x01, 0x02]); + let data = []; + assert_err_kind!(read8(&mut &data[..]), ErrorKind::UnexpectedEof); + let data = [0x01]; + assert_ok!(read8(&mut &data[..]), 0x01); + let data = [0x01, 0x02]; + let mut reader = &data[..]; let mut buf = Vec::new(); assert_ok!(read8(&mut reader), 0x01); assert_ok!(reader.read_to_end(&mut buf), 1); @@ -114,13 +114,14 @@ mod tests { #[test] fn read16_len() { - let mut reader = Cursor::new([]); - assert_err_kind!(read16(&mut reader), ErrorKind::UnexpectedEof); - let mut reader = Cursor::new([0x01]); - assert_err_kind!(read16(&mut reader), ErrorKind::UnexpectedEof); - let mut reader = Cursor::new([0x01, 0x02]); - assert_ok!(read16(&mut reader), 0x0102); - let mut reader = Cursor::new([0x01, 0x02, 0x03]); + let data = []; + assert_err_kind!(read16(&mut &data[..]), ErrorKind::UnexpectedEof); + let data = [0x01]; + assert_err_kind!(read16(&mut &data[..]), ErrorKind::UnexpectedEof); + let data = [0x01, 0x02]; + assert_ok!(read16(&mut &data[..]), 0x0102); + let data = [0x01, 0x02, 0x03]; + let mut reader = &data[..]; let mut buf = Vec::new(); assert_ok!(read16(&mut reader), 0x0102); assert_ok!(reader.read_to_end(&mut buf), 1);