error: Move ErrorKind::TooMuchData to aud_io

Author: Serial-ATA

lofty/src/ape/tag/write.rs

@@ -12,6 +12,7 @@ use crate::tag::item::ItemValueRef;
 use std::io::{Cursor, Seek, SeekFrom, Write};
 
 use aud_io::io::{FileLike, Truncate};
+use aud_io::err as io_err;
 use byteorder::{LittleEndian, WriteBytesExt};
 
 #[allow(clippy::shadow_unrelated)]
@@ -205,7 +206,7 @@ where
 	let size = tag_write.get_ref().len();
 
 	if size as u64 + 32 > u64::from(u32::MAX) {
-		err!(TooMuchData);
+		io_err!(TooMuchData);
 	}
 
 	let mut footer = [0_u8; 32];

lofty/src/error.rs

@@ -24,8 +24,6 @@ pub enum ErrorKind {
 	UnknownFormat,
 
 	// File data related errors
-	/// Attempting to read/write an abnormally large amount of data
-	TooMuchData,
 	/// Expected the data to be a different size than provided
 	///
 	/// This occurs when the size of an item is written as one value, but that size is either too
@@ -530,10 +528,6 @@ impl Display for LoftyError {
 			),
 
 			// Files
-			ErrorKind::TooMuchData => write!(
-				f,
-				"Attempted to read/write an abnormally large amount of data"
-			),
 			ErrorKind::SizeMismatch => write!(
 				f,
 				"Encountered an invalid item size, either too big or too small to be valid"

lofty/src/flac/write.rs

@@ -11,6 +11,7 @@ use crate::tag::{Tag, TagType};
 use std::borrow::Cow;
 use std::io::{Cursor, Read, Seek, SeekFrom, Write};
 
+use aud_io::err as io_err;
 use aud_io::io::{FileLike, Length, Truncate};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
@@ -195,7 +196,7 @@ fn create_comment_block(
 		let len = (writer.get_ref().len() - 1) as u32;
 
 		if len > MAX_BLOCK_SIZE {
-			err!(TooMuchData);
+			io_err!(TooMuchData);
 		}
 
 		let comment_end = writer.stream_position()?;
@@ -232,7 +233,7 @@ fn create_picture_blocks(
 		let pic_len = pic_bytes.len() as u32;
 
 		if pic_len > MAX_BLOCK_SIZE {
-			err!(TooMuchData);
+			io_err!(TooMuchData);
 		}
 
 		writer.write_all(&pic_len.to_be_bytes()[1..])?;

lofty/src/id3/v2/items/attached_picture_frame.rs

@@ -7,6 +7,7 @@ use crate::picture::{MimeType, Picture, PictureType};
 use std::borrow::Cow;
 use std::io::{Read, Write as _};
 
+use aud_io::err as io_err;
 use aud_io::text::{TextDecodeOptions, TextEncoding, encode_text};
 use byteorder::{ReadBytesExt as _, WriteBytesExt as _};
 
@@ -180,7 +181,7 @@ impl AttachedPictureFrame<'_> {
 		data.write_all(&self.picture.data)?;
 
 		if data.len() as u64 > max_size {
-			err!(TooMuchData);
+			io_err!(TooMuchData);
 		}
 
 		Ok(data)

lofty/src/id3/v2/items/sync_text.rs

@@ -1,6 +1,5 @@
 use crate::error::{Id3v2Error, Id3v2ErrorKind, Result};
 use crate::id3::v2::{FrameFlags, FrameHeader, FrameId};
-use crate::macros::err;
 
 use std::borrow::Cow;
 use std::io::{Cursor, Seek, Write};
@@ -250,7 +249,7 @@ impl SynchronizedTextFrame<'_> {
 			}
 
 			if data.len() as u64 > u64::from(u32::MAX) {
-				err!(TooMuchData);
+				io_err!(TooMuchData);
 			}
 
 			return Ok(data);

lofty/src/id3/v2/util/synchsafe.rs

@@ -243,7 +243,7 @@ macro_rules! impl_synchsafe {
 				};
 
 				if self > MAXIMUM_INTEGER {
-					crate::macros::err!(TooMuchData);
+					aud_io::err!(TooMuchData);
 				}
 
 				let $n = self;

lofty/src/id3/v2/write/chunk_file.rs

@@ -5,6 +5,7 @@ use crate::macros::err;
 
 use std::io::{Cursor, Seek, SeekFrom, Write};
 
+use aud_io::err as io_err;
 use aud_io::io::{FileLike, Length, Truncate};
 use byteorder::{ByteOrder, WriteBytesExt};
 
@@ -91,7 +92,7 @@ where
 		}
 
 		let Ok(tag_size): std::result::Result<u32, _> = tag_bytes.get_ref().len().try_into() else {
-			err!(TooMuchData)
+			io_err!(TooMuchData)
 		};
 
 		let tag_position = actual_stream_size as usize + RIFF_CHUNK_HEADER_SIZE;

lofty/src/iff/aiff/tag.rs

@@ -1,13 +1,13 @@
 use crate::config::WriteOptions;
 use crate::error::{LoftyError, Result};
 use crate::iff::chunk::Chunks;
-use crate::macros::err;
 use crate::tag::{Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType};
 
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::io::{SeekFrom, Write};
 
+use aud_io::err as io_err;
 use aud_io::io::{FileLike, Length, Truncate};
 use byteorder::BigEndian;
 use lofty_attr::tag;
@@ -371,7 +371,7 @@ where
 						let comt_len = comt.text.len();
 
 						if comt_len > u16::MAX as usize {
-							err!(TooMuchData);
+							io_err!(TooMuchData);
 						}
 
 						text_chunks.extend((comt_len as u16).to_be_bytes());
@@ -394,7 +394,7 @@ where
 							i += 1;
 						}
 					} else {
-						err!(TooMuchData);
+						io_err!(TooMuchData);
 					}
 
 					if (text_chunks.len() - 4) % 2 != 0 {

lofty/src/iff/wav/tag/write.rs

@@ -7,6 +7,7 @@ use crate::macros::err;
 
 use std::io::{Cursor, Read, Seek, SeekFrom};
 
+use aud_io::err as io_err;
 use aud_io::io::{FileLike, Length, Truncate};
 use byteorder::{LittleEndian, WriteBytesExt};
 
@@ -154,7 +155,7 @@ pub(super) fn create_riff_info(
 	let packet_size = Vec::len(bytes) - 4;
 
 	if packet_size > u32::MAX as usize {
-		err!(TooMuchData);
+		io_err!(TooMuchData);
 	}
 
 	log::debug!("Created RIFF INFO list, size: {} bytes", packet_size);

lofty/src/mp4/ilst/write.rs

@@ -3,7 +3,7 @@ use super::r#ref::IlstRef;
 use crate::config::{ParseOptions, WriteOptions};
 use crate::error::{FileEncodingError, LoftyError, Result};
 use crate::file::FileType;
-use crate::macros::{decode_err, err, try_vec};
+use crate::macros::{decode_err, try_vec};
 use crate::mp4::AtomData;
 use crate::mp4::atom_info::{ATOM_HEADER_LEN, AtomIdent, AtomInfo, FOURCC_LEN};
 use crate::mp4::ilst::r#ref::AtomRef;
@@ -13,6 +13,7 @@ use crate::picture::{MimeType, Picture};
 
 use std::io::{Cursor, Seek, SeekFrom, Write};
 
+use aud_io::err as io_err;
 use aud_io::io::{FileLike, Length, Truncate};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use aud_io::alloc::VecFallibleCapacity;
@@ -298,7 +299,7 @@ fn save_to_existing(
 
 				let remaining_space = available_space - ilst_len;
 				if remaining_space > u64::from(u32::MAX) {
-					err!(TooMuchData);
+					io_err!(TooMuchData);
 				}
 
 				let remaining_space = remaining_space as u32;