From 2698618f93bad7c8cb78d38fe041608cf4455c39 Mon Sep 17 00:00:00 2001
From: Serial <69764315+Serial-ATA@users.noreply.github.com>
Date: Sat, 20 Apr 2024 12:30:43 -0400
Subject: [PATCH] misc: Fix some imports

---
 src/flac/mod.rs                | 2 +-
 src/flac/write.rs              | 2 +-
 src/id3/v1/tag.rs              | 3 ++-
 src/id3/v1/write.rs            | 2 +-
 src/id3/v2/tag.rs              | 2 +-
 src/id3/v2/write/chunk_file.rs | 3 ++-
 src/id3/v2/write/mod.rs        | 2 +-
 src/iff/aiff/tag.rs            | 2 +-
 src/iff/wav/tag/mod.rs         | 2 +-
 src/iff/wav/tag/write.rs       | 2 +-
 src/mp4/ilst/mod.rs            | 2 +-
 src/mp4/ilst/ref.rs            | 2 +-
 src/mp4/ilst/write.rs          | 3 ++-
 src/tag/mod.rs                 | 2 +-
 src/tag/tag_type.rs            | 4 ++--
 src/tag/utils.rs               | 2 +-
 src/traits.rs                  | 0
 src/util/io.rs                 | 1 +
 18 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 src/traits.rs

diff --git a/src/flac/mod.rs b/src/flac/mod.rs
index 4f586472c..72d1d0f73 100644
--- a/src/flac/mod.rs
+++ b/src/flac/mod.rs
@@ -17,11 +17,11 @@ use crate::ogg::tag::VorbisCommentsRef;
 use crate::ogg::{OggPictureStorage, VorbisComments};
 use crate::picture::{Picture, PictureInformation};
 use crate::tag::TagExt;
+use crate::util::io::{FileLike, Length, Truncate};
 
 use lofty_attr::LoftyFile;
 
 // Exports
-use crate::util::io::{FileLike, Length, Truncate};
 pub use properties::FlacProperties;
 
 /// A FLAC file
diff --git a/src/flac/write.rs b/src/flac/write.rs
index 54ca3a584..46aaac32c 100644
--- a/src/flac/write.rs
+++ b/src/flac/write.rs
@@ -7,10 +7,10 @@ use crate::ogg::tag::VorbisCommentsRef;
 use crate::ogg::write::create_comments;
 use crate::picture::{Picture, PictureInformation};
 use crate::tag::{Tag, TagType};
+use crate::util::io::{FileLike, Length, Truncate};
 
 use std::io::{Cursor, Seek, SeekFrom, Write};
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::{LittleEndian, WriteBytesExt};
 
 const BLOCK_HEADER_SIZE: usize = 4;
diff --git a/src/id3/v1/tag.rs b/src/id3/v1/tag.rs
index c68022cf0..02806575c 100644
--- a/src/id3/v1/tag.rs
+++ b/src/id3/v1/tag.rs
@@ -2,11 +2,12 @@ use crate::config::WriteOptions;
 use crate::error::{LoftyError, Result};
 use crate::id3::v1::constants::GENRES;
 use crate::tag::{Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType};
+use crate::util::io::{FileLike, Length, Truncate};
+
 use std::borrow::Cow;
 use std::io::Write;
 use std::path::Path;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use lofty_attr::tag;
 
 macro_rules! impl_accessor {
diff --git a/src/id3/v1/write.rs b/src/id3/v1/write.rs
index 98131bc11..2d9582d97 100644
--- a/src/id3/v1/write.rs
+++ b/src/id3/v1/write.rs
@@ -4,10 +4,10 @@ use crate::error::{LoftyError, Result};
 use crate::id3::{find_id3v1, ID3FindResults};
 use crate::macros::err;
 use crate::probe::Probe;
+use crate::util::io::{FileLike, Length, Truncate};
 
 use std::io::{Cursor, Seek, Write};
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::WriteBytesExt;
 
 #[allow(clippy::shadow_unrelated)]
diff --git a/src/id3/v2/tag.rs b/src/id3/v2/tag.rs
index 36cae4dfc..47e5f7249 100644
--- a/src/id3/v2/tag.rs
+++ b/src/id3/v2/tag.rs
@@ -21,13 +21,13 @@ use crate::picture::{Picture, PictureType, TOMBSTONE_PICTURE};
 use crate::tag::{
 	try_parse_year, Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType,
 };
+use crate::util::io::{FileLike, Length, Truncate};
 use crate::util::text::{decode_text, TextDecodeOptions, TextEncoding};
 
 use std::borrow::Cow;
 use std::io::{Cursor, Write};
 use std::ops::Deref;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use lofty_attr::tag;
 
 const USER_DEFINED_TEXT_FRAME_ID: &str = "TXXX";
diff --git a/src/id3/v2/write/chunk_file.rs b/src/id3/v2/write/chunk_file.rs
index 7873e3fed..d4ba3caf5 100644
--- a/src/id3/v2/write/chunk_file.rs
+++ b/src/id3/v2/write/chunk_file.rs
@@ -1,9 +1,10 @@
 use crate::config::WriteOptions;
 use crate::error::{LoftyError, Result};
 use crate::iff::chunk::Chunks;
+use crate::util::io::{FileLike, Length, Truncate};
+
 use std::io::SeekFrom;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::{ByteOrder, WriteBytesExt};
 
 const CHUNK_NAME_UPPER: [u8; 4] = [b'I', b'D', b'3', b' '];
diff --git a/src/id3/v2/write/mod.rs b/src/id3/v2/write/mod.rs
index 5fce665c0..99c89a905 100644
--- a/src/id3/v2/write/mod.rs
+++ b/src/id3/v2/write/mod.rs
@@ -12,12 +12,12 @@ use crate::id3::v2::Id3v2Tag;
 use crate::id3::{find_id3v2, FindId3v2Config};
 use crate::macros::{err, try_vec};
 use crate::probe::Probe;
+use crate::util::io::{FileLike, Length, Truncate};
 
 use std::io::{Cursor, Read, Seek, SeekFrom, Write};
 use std::ops::Not;
 use std::sync::OnceLock;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::{BigEndian, LittleEndian, WriteBytesExt};
 
 // In the very rare chance someone wants to write a CRC in their extended header
diff --git a/src/iff/aiff/tag.rs b/src/iff/aiff/tag.rs
index dc5d130f4..7c05add7e 100644
--- a/src/iff/aiff/tag.rs
+++ b/src/iff/aiff/tag.rs
@@ -3,12 +3,12 @@ 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 crate::util::io::{FileLike, Length, Truncate};
 
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::io::{SeekFrom, Write};
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::BigEndian;
 use lofty_attr::tag;
 
diff --git a/src/iff/wav/tag/mod.rs b/src/iff/wav/tag/mod.rs
index 64679a982..76487c9c8 100644
--- a/src/iff/wav/tag/mod.rs
+++ b/src/iff/wav/tag/mod.rs
@@ -6,11 +6,11 @@ use crate::error::{LoftyError, Result};
 use crate::tag::{
 	try_parse_year, Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType,
 };
+use crate::util::io::{FileLike, Length, Truncate};
 
 use std::borrow::Cow;
 use std::io::Write;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use lofty_attr::tag;
 
 macro_rules! impl_accessor {
diff --git a/src/iff/wav/tag/write.rs b/src/iff/wav/tag/write.rs
index 141509a19..732c76d00 100644
--- a/src/iff/wav/tag/write.rs
+++ b/src/iff/wav/tag/write.rs
@@ -4,10 +4,10 @@ use crate::error::{LoftyError, Result};
 use crate::iff::chunk::Chunks;
 use crate::iff::wav::read::verify_wav;
 use crate::macros::err;
+use crate::util::io::{FileLike, Length, Truncate};
 
 use std::io::{Read, Seek, SeekFrom};
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::{LittleEndian, WriteBytesExt};
 
 pub(in crate::iff::wav) fn write_riff_info<'a, F, I>(
diff --git a/src/mp4/ilst/mod.rs b/src/mp4/ilst/mod.rs
index a1996c911..ff2c97bad 100644
--- a/src/mp4/ilst/mod.rs
+++ b/src/mp4/ilst/mod.rs
@@ -12,13 +12,13 @@ use crate::picture::{Picture, PictureType, TOMBSTONE_PICTURE};
 use crate::tag::{
 	try_parse_year, Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType,
 };
+use crate::util::io::{FileLike, Length, Truncate};
 use atom::{AdvisoryRating, Atom, AtomData};
 
 use std::borrow::Cow;
 use std::io::Write;
 use std::ops::Deref;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use lofty_attr::tag;
 
 const ARTIST: AtomIdent<'_> = AtomIdent::Fourcc(*b"\xa9ART");
diff --git a/src/mp4/ilst/ref.rs b/src/mp4/ilst/ref.rs
index f7daf1fd1..1fa6c0141 100644
--- a/src/mp4/ilst/ref.rs
+++ b/src/mp4/ilst/ref.rs
@@ -5,8 +5,8 @@
 use crate::config::WriteOptions;
 use crate::error::{LoftyError, Result};
 use crate::mp4::{Atom, AtomData, AtomIdent, Ilst};
-
 use crate::util::io::{FileLike, Length, Truncate};
+
 use std::io::Write;
 
 impl Ilst {
diff --git a/src/mp4/ilst/write.rs b/src/mp4/ilst/write.rs
index b49ad7e55..df5aeab1a 100644
--- a/src/mp4/ilst/write.rs
+++ b/src/mp4/ilst/write.rs
@@ -9,9 +9,10 @@ use crate::mp4::read::{atom_tree, meta_is_full, nested_atom, verify_mp4, AtomRea
 use crate::mp4::write::{AtomWriter, AtomWriterCompanion, ContextualAtom};
 use crate::mp4::AtomData;
 use crate::picture::{MimeType, Picture};
+use crate::util::io::{FileLike, Length, Truncate};
+
 use std::io::{Cursor, Seek, SeekFrom, Write};
 
-use crate::util::io::{FileLike, Length, Truncate};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 
 // A "full" atom is a traditional length + identifier, followed by a version (1) and flags (3)
diff --git a/src/tag/mod.rs b/src/tag/mod.rs
index 1fda02661..a4507dada 100644
--- a/src/tag/mod.rs
+++ b/src/tag/mod.rs
@@ -12,13 +12,13 @@ use crate::error::{LoftyError, Result};
 use crate::macros::err;
 use crate::picture::{Picture, PictureType};
 use crate::probe::Probe;
+use crate::util::io::{FileLike, Length, Truncate};
 
 use std::borrow::Cow;
 use std::io::Write;
 use std::path::Path;
 
 // Exports
-use crate::util::io::{FileLike, Length, Truncate};
 pub use accessor::Accessor;
 pub use item::{ItemKey, ItemValue, TagItem};
 pub use split_merge_tag::{MergeTag, SplitTag};
diff --git a/src/tag/tag_type.rs b/src/tag/tag_type.rs
index 63598e39d..f995a968d 100644
--- a/src/tag/tag_type.rs
+++ b/src/tag/tag_type.rs
@@ -1,11 +1,11 @@
 use super::{utils, Tag};
 use crate::config::WriteOptions;
+use crate::error::LoftyError;
 use crate::file::FileType;
+use crate::io::{FileLike, Length, Truncate};
 use crate::macros::err;
 use crate::probe::Probe;
 
-use crate::error::LoftyError;
-use crate::io::{FileLike, Length, Truncate};
 use std::fs::OpenOptions;
 use std::path::Path;
 
diff --git a/src/tag/utils.rs b/src/tag/utils.rs
index 79b3ce745..40cd0fcff 100644
--- a/src/tag/utils.rs
+++ b/src/tag/utils.rs
@@ -3,6 +3,7 @@ use crate::error::{LoftyError, Result};
 use crate::file::FileType;
 use crate::macros::err;
 use crate::tag::{Tag, TagType};
+use crate::util::io::{FileLike, Length, Truncate};
 use crate::{aac, ape, flac, iff, mpeg, musepack, wavpack};
 
 use crate::id3::v1::tag::Id3v1TagRef;
@@ -14,7 +15,6 @@ use ape::tag::ApeTagRef;
 use iff::aiff::tag::AiffTextChunksRef;
 use iff::wav::tag::RIFFInfoListRef;
 
-use crate::util::io::{FileLike, Length, Truncate};
 use std::io::Write;
 
 #[allow(unreachable_patterns)]
diff --git a/src/traits.rs b/src/traits.rs
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/util/io.rs b/src/util/io.rs
index e7f3082f1..7b9f1f0e9 100644
--- a/src/util/io.rs
+++ b/src/util/io.rs
@@ -1,6 +1,7 @@
 //! Various traits for reading and writing to file-like objects
 
 use crate::error::LoftyError;
+
 use std::collections::VecDeque;
 use std::fs::File;
 use std::io::{Cursor, Read, Seek, Write};