misc: fmt

Serial-ATA · Serial-ATA · commit 8746e257c70d · 2025-11-10T14:22:57.000-05:00
diff --git a/aud_io/src/alloc.rs b/aud_io/src/alloc.rs
@@ -1,6 +1,6 @@
-use crate::error::Result;
-use crate::err;
 use crate::config::global_options;
+use crate::err;
+use crate::error::Result;
 
 /// Provides the `fallible_repeat` method on [`Vec`]
 ///
diff --git a/aud_io/src/config/global_options.rs b/aud_io/src/config/global_options.rs
@@ -16,7 +16,8 @@ pub(crate) unsafe fn global_options() -> &'static GlobalOptions {
 /// use aud_io::config::{GlobalOptions, apply_global_options};
 ///
 /// // I want to double the allocation limit
-/// let global_options = GlobalOptions::new().allocation_limit(GlobalOptions::DEFAULT_ALLOCATION_LIMIT * 2);
+/// let global_options =
+/// 	GlobalOptions::new().allocation_limit(GlobalOptions::DEFAULT_ALLOCATION_LIMIT * 2);
 /// apply_global_options(global_options);
 /// ```
 #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
@@ -58,7 +59,8 @@ impl GlobalOptions {
 	/// use aud_io::config::{GlobalOptions, apply_global_options};
 	///
 	/// // I have files with gigantic images, I'll double the allocation limit!
-	/// let global_options = GlobalOptions::new().allocation_limit(GlobalOptions::DEFAULT_ALLOCATION_LIMIT * 2);
+	/// let global_options =
+	/// 	GlobalOptions::new().allocation_limit(GlobalOptions::DEFAULT_ALLOCATION_LIMIT * 2);
 	/// apply_global_options(global_options);
 	/// ```
 	pub fn allocation_limit(&mut self, allocation_limit: usize) -> Self {
@@ -90,7 +92,8 @@ impl Default for GlobalOptions {
 /// use aud_io::config::{GlobalOptions, apply_global_options};
 ///
 /// // I want to double the allocation limit
-/// let global_options = GlobalOptions::new().allocation_limit(GlobalOptions::DEFAULT_ALLOCATION_LIMIT * 2);
+/// let global_options =
+/// 	GlobalOptions::new().allocation_limit(GlobalOptions::DEFAULT_ALLOCATION_LIMIT * 2);
 /// apply_global_options(global_options);
 /// ```
 pub fn apply_global_options(options: GlobalOptions) {
diff --git a/aud_io/src/error.rs b/aud_io/src/error.rs
@@ -21,7 +21,7 @@ pub enum AudioError {
 	// Format-specific
 	/// Arises when an MP4 atom contains invalid data
 	BadAtom(&'static str),
-	
+
 	// Conversions for external errors
 	/// Represents all cases of [`std::io::Error`].
 	Io(std::io::Error),
@@ -69,7 +69,7 @@ impl Display for AudioError {
 	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
 		match self {
 			AudioError::TextDecode(message) => write!(f, "Text decoding: {message}"),
-			
+
 			// Conversions
 			AudioError::StringFromUtf8(err) => write!(f, "{err}"),
 			AudioError::StrFromUtf8(err) => write!(f, "{err}"),
@@ -86,7 +86,7 @@ impl Display for AudioError {
 				f,
 				"Encountered an invalid item size, either too big or too small to be valid"
 			),
-			
+
 			// Format-specific
 			AudioError::BadAtom(message) => write!(f, "MP4 Atom: {message}"),
 		}
diff --git a/aud_io/src/lib.rs b/aud_io/src/lib.rs
@@ -1,8 +1,8 @@
-pub mod text;
+pub mod alloc;
+pub mod config;
 pub mod error;
+pub mod io;
 pub(crate) mod macros;
 pub mod math;
-pub mod io;
-pub mod config;
-pub mod alloc;
 pub mod mp4;
+pub mod text;
diff --git a/aud_io/src/mp4/atom_info.rs b/aud_io/src/mp4/atom_info.rs
@@ -216,10 +216,10 @@ where
 
 	match atom {
 		Some(AtomInfo {
-				 ident: AtomIdent::Fourcc(ref fourcc),
-				 len,
-				 ..
-			 }) if fourcc == name => {
+			ident: AtomIdent::Fourcc(ref fourcc),
+			len,
+			..
+		}) if fourcc == name => {
 			if len < 12 {
 				err!(BadAtom("Found an incomplete freeform identifier chunk"));
 			}
@@ -239,9 +239,7 @@ where
 			*reader_size -= len;
 
 			utf8_decode(content).map_err(|_| {
-				AudioError::BadAtom(
-					"Found a non UTF-8 string while reading freeform identifier",
-				)
+				AudioError::BadAtom("Found a non UTF-8 string while reading freeform identifier")
 			})
 		},
 		_ => err!(BadAtom(
diff --git a/aud_io/src/mp4/atom_reader.rs b/aud_io/src/mp4/atom_reader.rs
@@ -1,7 +1,7 @@
-use crate::config::ParsingMode;
-use crate::error::Result;
 use super::atom_info::AtomInfo;
+use crate::config::ParsingMode;
 use crate::err;
+use crate::error::Result;
 use crate::io::SeekStreamLen;
 
 use std::io::{Read, Seek, SeekFrom};
diff --git a/aud_io/src/text.rs b/aud_io/src/text.rs
@@ -1,5 +1,5 @@
-use crate::error::{AudioError, Result};
 use crate::err;
+use crate::error::{AudioError, Result};
 
 use std::io::Read;
 
@@ -157,8 +157,9 @@ where
 			}
 		},
 		TextEncoding::UTF16BE => utf16_decode_bytes(raw_bytes.as_slice(), u16::from_be_bytes)?,
-		TextEncoding::UTF8 => utf8_decode(raw_bytes)
-			.map_err(|_| AudioError::TextDecode("Expected a UTF-8 string"))?,
+		TextEncoding::UTF8 => {
+			utf8_decode(raw_bytes).map_err(|_| AudioError::TextDecode("Expected a UTF-8 string"))?
+		},
 	};
 
 	Ok(DecodeTextResult {
@@ -356,7 +357,7 @@ mod tests {
 			],
 			u16::from_be_bytes,
 		)
-			.unwrap();
+		.unwrap();
 
 		assert_eq!(utf16_decode, TEST_STRING.to_string());
 
@@ -367,14 +368,14 @@ mod tests {
 			]),
 			TextDecodeOptions::new().encoding(TextEncoding::UTF16),
 		)
-			.unwrap();
+		.unwrap();
 		let le_utf16_decode = super::decode_text(
 			&mut Cursor::new(&[
 				0xFF, 0xFE, 0x6C, 0x00, 0xF8, 0x00, 0x66, 0x00, 0x74, 0x00, 0xA5, 0x00, 0x00, 0x00,
 			]),
 			TextDecodeOptions::new().encoding(TextEncoding::UTF16),
 		)
-			.unwrap();
+		.unwrap();
 
 		assert_eq!(be_utf16_decode.content, le_utf16_decode.content);
 		assert_eq!(be_utf16_decode.bytes_read, le_utf16_decode.bytes_read);
@@ -384,7 +385,7 @@ mod tests {
 			&mut TEST_STRING.as_bytes(),
 			TextDecodeOptions::new().encoding(TextEncoding::UTF8),
 		)
-			.unwrap();
+		.unwrap();
 
 		assert_eq!(utf8_decode.content, TEST_STRING.to_string());
 	}
diff --git a/lofty/src/ape/tag/write.rs b/lofty/src/ape/tag/write.rs
@@ -11,8 +11,8 @@ 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 aud_io::io::{FileLike, Truncate};
 use byteorder::{LittleEndian, WriteBytesExt};
 
 #[allow(clippy::shadow_unrelated)]
diff --git a/lofty/src/config/global_options.rs b/lofty/src/config/global_options.rs
@@ -29,7 +29,8 @@ pub struct GlobalOptions {
 
 impl GlobalOptions {
 	/// Default allocation limit for any single tag item
-	pub const DEFAULT_ALLOCATION_LIMIT: usize = aud_io::config::GlobalOptions::DEFAULT_ALLOCATION_LIMIT;
+	pub const DEFAULT_ALLOCATION_LIMIT: usize =
+		aud_io::config::GlobalOptions::DEFAULT_ALLOCATION_LIMIT;
 
 	/// Creates a new `GlobalOptions`, alias for `Default` implementation
 	///
diff --git a/lofty/src/error.rs b/lofty/src/error.rs
@@ -9,8 +9,8 @@ use crate::tag::ItemKey;
 
 use std::fmt::{Debug, Display, Formatter};
 
-use ogg_pager::PageError;
 use aud_io::error::AudioError;
+use ogg_pager::PageError;
 
 /// Alias for `Result<T, LoftyError>`
 pub type Result<T> = std::result::Result<T, LoftyError>;
diff --git a/lofty/src/id3/mod.rs b/lofty/src/id3/mod.rs
@@ -13,8 +13,8 @@ use v2::header::Id3v2Header;
 use std::io::{Read, Seek, SeekFrom};
 use std::ops::Neg;
 
-use aud_io::text::utf8_decode_str;
 use aud_io::err as io_err;
+use aud_io::text::utf8_decode_str;
 
 pub(crate) struct ID3FindResults<Header, Content>(pub Option<Header>, pub Content);
 
diff --git a/lofty/src/id3/v2/frame/content.rs b/lofty/src/id3/v2/frame/content.rs
@@ -11,8 +11,8 @@ use crate::id3::v2::{BinaryFrame, Frame, FrameFlags, FrameId};
 
 use std::io::Read;
 
-use aud_io::text::TextEncoding;
 use aud_io::err as io_err;
+use aud_io::text::TextEncoding;
 
 #[rustfmt::skip]
 pub(super) fn parse_content<R: Read>(
diff --git a/lofty/src/id3/v2/frame/conversion.rs b/lofty/src/id3/v2/frame/conversion.rs
@@ -12,8 +12,8 @@ use crate::tag::{ItemKey, ItemValue, TagItem, TagType};
 
 use std::borrow::Cow;
 
-use aud_io::text::TextEncoding;
 use aud_io::err as io_err;
+use aud_io::text::TextEncoding;
 
 fn frame_from_unknown_item(id: FrameId<'_>, item_value: ItemValue) -> Result<Frame<'_>> {
 	match item_value {
diff --git a/lofty/src/id3/v2/frame/header/parse.rs b/lofty/src/id3/v2/frame/header/parse.rs
@@ -1,9 +1,9 @@
 use super::FrameFlags;
+use crate::config::ParseOptions;
 use crate::error::{Id3v2Error, Id3v2ErrorKind, Result};
 use crate::id3::v2::FrameId;
 use crate::id3::v2::util::synchsafe::SynchsafeInteger;
 use crate::id3::v2::util::upgrade::{upgrade_v2, upgrade_v3};
-use crate::config::ParseOptions;
 
 use std::borrow::Cow;
 use std::io::Read;
diff --git a/lofty/src/id3/v2/items/audio_text_frame.rs b/lofty/src/id3/v2/items/audio_text_frame.rs
@@ -5,7 +5,7 @@ use std::borrow::Cow;
 use std::hash::{Hash, Hasher};
 
 use aud_io::err as io_err;
-use aud_io::text::{decode_text, encode_text, TextDecodeOptions, TextEncoding};
+use aud_io::text::{TextDecodeOptions, TextEncoding, decode_text, encode_text};
 use byteorder::ReadBytesExt as _;
 
 const FRAME_ID: FrameId<'static> = FrameId::Valid(Cow::Borrowed("ATXT"));
@@ -237,7 +237,7 @@ pub fn scramble(audio_data: &mut [u8]) {
 #[cfg(test)]
 mod tests {
 	use crate::id3::v2::{AudioTextFrame, AudioTextFrameFlags, FrameFlags};
-	
+
 	use aud_io::text::TextEncoding;
 
 	fn expected() -> AudioTextFrame<'static> {
diff --git a/lofty/src/id3/v2/items/encapsulated_object.rs b/lofty/src/id3/v2/items/encapsulated_object.rs
@@ -4,7 +4,7 @@ use crate::id3::v2::{FrameFlags, FrameHeader, FrameId};
 use std::io::{Cursor, Read};
 
 use aud_io::err as io_err;
-use aud_io::text::{decode_text, encode_text, TextDecodeOptions, TextEncoding};
+use aud_io::text::{TextDecodeOptions, TextEncoding, decode_text, encode_text};
 
 const FRAME_ID: FrameId<'static> = FrameId::Valid(std::borrow::Cow::Borrowed("GEOB"));
 
diff --git a/lofty/src/id3/v2/items/extended_text_frame.rs b/lofty/src/id3/v2/items/extended_text_frame.rs
@@ -7,10 +7,8 @@ use std::borrow::Cow;
 use std::hash::{Hash, Hasher};
 use std::io::Read;
 
-use aud_io::text::{
-	TextDecodeOptions, TextEncoding, decode_text, encode_text, utf16_decode_bytes,
-};
 use aud_io::err as io_err;
+use aud_io::text::{TextDecodeOptions, TextEncoding, decode_text, encode_text, utf16_decode_bytes};
 use byteorder::ReadBytesExt;
 
 const FRAME_ID: FrameId<'static> = FrameId::Valid(Cow::Borrowed("TXXX"));
diff --git a/lofty/src/id3/v2/items/language_frame.rs b/lofty/src/id3/v2/items/language_frame.rs
@@ -8,11 +8,11 @@ use std::borrow::Cow;
 use std::hash::{Hash, Hasher};
 use std::io::Read;
 
+use aud_io::err as io_err;
 use aud_io::text::{
 	DecodeTextResult, TextDecodeOptions, TextEncoding, decode_text, encode_text,
 	utf16_decode_terminated_maybe_bom,
 };
-use aud_io::err as io_err;
 use byteorder::ReadBytesExt;
 
 // Generic struct for a text frame that has a language
diff --git a/lofty/src/id3/v2/items/ownership_frame.rs b/lofty/src/id3/v2/items/ownership_frame.rs
@@ -6,9 +6,7 @@ use std::hash::Hash;
 use std::io::Read;
 
 use aud_io::err as io_err;
-use aud_io::text::{
-	decode_text, encode_text, utf8_decode_str, TextDecodeOptions, TextEncoding,
-};
+use aud_io::text::{TextDecodeOptions, TextEncoding, decode_text, encode_text, utf8_decode_str};
 use byteorder::ReadBytesExt;
 
 const FRAME_ID: FrameId<'static> = FrameId::Valid(Cow::Borrowed("OWNE"));
diff --git a/lofty/src/id3/v2/items/sync_text.rs b/lofty/src/id3/v2/items/sync_text.rs
@@ -6,8 +6,8 @@ use std::io::{Cursor, Seek, Write};
 
 use aud_io::err as io_err;
 use aud_io::text::{
-	decode_text, encode_text, utf16_decode_terminated_maybe_bom, DecodeTextResult, TextDecodeOptions,
-	TextEncoding,
+	DecodeTextResult, TextDecodeOptions, TextEncoding, decode_text, encode_text,
+	utf16_decode_terminated_maybe_bom,
 };
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 
@@ -139,7 +139,7 @@ impl SynchronizedTextFrame<'_> {
 		let Some(encoding) = TextEncoding::from_u8(data[0]) else {
 			io_err!(TextDecode("Found invalid encoding"));
 		};
-		
+
 		let language: [u8; 3] = data[1..4].try_into().unwrap();
 		if language.iter().any(|c| !c.is_ascii_alphabetic()) {
 			return Err(Id3v2Error::new(Id3v2ErrorKind::BadSyncText).into());
diff --git a/lofty/src/id3/v2/items/timestamp_frame.rs b/lofty/src/id3/v2/items/timestamp_frame.rs
@@ -6,8 +6,8 @@ use crate::tag::items::Timestamp;
 
 use std::io::Read;
 
-use aud_io::text::{TextDecodeOptions, TextEncoding, decode_text, encode_text};
 use aud_io::err as io_err;
+use aud_io::text::{TextDecodeOptions, TextEncoding, decode_text, encode_text};
 use byteorder::ReadBytesExt;
 
 /// An `ID3v2` timestamp frame
diff --git a/lofty/src/id3/v2/mod.rs b/lofty/src/id3/v2/mod.rs
@@ -53,4 +53,4 @@ impl Id3TextEncodingExt for aud_io::text::TextEncoding {
 			_ => self,
 		}
 	}
-}
+}
diff --git a/lofty/src/id3/v2/write/frame.rs b/lofty/src/id3/v2/write/frame.rs
@@ -1,9 +1,9 @@
 use crate::error::{Id3v2Error, Id3v2ErrorKind, Result};
 use crate::id3::v2::frame::{FrameFlags, FrameRef};
+use crate::id3::v2::tag::GenresIter;
 use crate::id3::v2::util::synchsafe::SynchsafeInteger;
 use crate::id3::v2::{Frame, FrameId, Id3TextEncodingExt, KeyValueFrame, TextInformationFrame};
 use crate::tag::items::Timestamp;
-use crate::id3::v2::tag::GenresIter;
 
 use std::io::Write;
 
diff --git a/lofty/src/iff/aiff/properties.rs b/lofty/src/iff/aiff/properties.rs
@@ -1,8 +1,8 @@
 use super::read::CompressionPresent;
 use crate::error::Result;
+use crate::io::ReadExt;
 use crate::macros::{decode_err, try_vec};
 use crate::properties::FileProperties;
-use crate::io::ReadExt;
 
 use std::borrow::Cow;
 use std::io::Read;
diff --git a/lofty/src/iff/wav/tag/read.rs b/lofty/src/iff/wav/tag/read.rs
@@ -6,9 +6,9 @@ use crate::macros::decode_err;
 
 use std::io::{Read, Seek};
 
+use aud_io::error::AudioError;
 use aud_io::text::utf8_decode_str;
 use byteorder::LittleEndian;
-use aud_io::error::AudioError;
 
 pub(in crate::iff::wav) fn parse_riff_info<R>(
 	data: &mut R,
diff --git a/lofty/src/lib.rs b/lofty/src/lib.rs
@@ -130,8 +130,8 @@ pub mod wavpack;
 
 pub use crate::probe::{read_from, read_from_path};
 
-pub use aud_io::text::TextEncoding;
 pub use aud_io::io;
+pub use aud_io::text::TextEncoding;
 
 pub use lofty_attr::LoftyFile;
 
diff --git a/lofty/src/mp4/ilst/read.rs b/lofty/src/mp4/ilst/read.rs
@@ -14,8 +14,8 @@ use std::borrow::Cow;
 use std::io::{Cursor, Read, Seek, SeekFrom};
 
 use aud_io::err as io_err;
-use aud_io::text::{utf8_decode, utf16_decode_bytes};
 use aud_io::mp4::{ATOM_HEADER_LEN, AtomInfo, AtomReader};
+use aud_io::text::{utf8_decode, utf16_decode_bytes};
 
 pub(in crate::mp4) fn parse_ilst<R>(
 	reader: &mut AtomReader<R>,
diff --git a/lofty/src/mp4/ilst/write.rs b/lofty/src/mp4/ilst/write.rs
diff --git a/lofty/src/mp4/moov.rs b/lofty/src/mp4/moov.rs
diff --git a/lofty/src/mp4/properties.rs b/lofty/src/mp4/properties.rs
diff --git a/lofty/src/mp4/read.rs b/lofty/src/mp4/read.rs
diff --git a/lofty/src/ogg/read.rs b/lofty/src/ogg/read.rs
diff --git a/lofty/tests/io.rs b/lofty/tests/io.rs
