From 4a60c1c4e201a73e14770854986262129dbe030b Mon Sep 17 00:00:00 2001
From: Serial <69764315+Serial-ATA@users.noreply.github.com>
Date: Tue, 18 Jul 2023 01:17:38 -0400
Subject: [PATCH] Clippy

---
 src/id3/v2/frame/mod.rs                              | 2 +-
 src/id3/v2/items/event_timing_codes_frame.rs         | 6 +++---
 src/id3/v2/items/ownership_frame.rs                  | 5 +++++
 src/id3/v2/items/private_frame.rs                    | 4 ++++
 src/id3/v2/items/relative_volume_adjustment_frame.rs | 9 +++++++--
 src/lib.rs                                           | 1 +
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/id3/v2/frame/mod.rs b/src/id3/v2/frame/mod.rs
index 8b219951f..b203157e1 100644
--- a/src/id3/v2/frame/mod.rs
+++ b/src/id3/v2/frame/mod.rs
@@ -324,7 +324,7 @@ impl FrameValue {
 			FrameValue::RelativeVolumeAdjustment(frame) => frame.as_bytes(),
 			FrameValue::UniqueFileIdentifier(frame) => frame.as_bytes(),
 			FrameValue::Ownership(frame) => frame.as_bytes()?,
-			FrameValue::EventTimingCodes(frame) => frame.as_bytes()?,
+			FrameValue::EventTimingCodes(frame) => frame.as_bytes(),
 			FrameValue::Private(frame) => frame.as_bytes(),
 			FrameValue::Binary(binary) => binary.clone(),
 		})
diff --git a/src/id3/v2/items/event_timing_codes_frame.rs b/src/id3/v2/items/event_timing_codes_frame.rs
index 47e766482..9de3f45cb 100644
--- a/src/id3/v2/items/event_timing_codes_frame.rs
+++ b/src/id3/v2/items/event_timing_codes_frame.rs
@@ -223,7 +223,7 @@ impl EventTimingCodesFrame {
 	/// Convert an [`EventTimingCodesFrame`] to a byte vec
 	///
 	/// NOTE: This will sort all events according to their timestamps
-	pub fn as_bytes(&self) -> Result<Vec<u8>> {
+	pub fn as_bytes(&self) -> Vec<u8> {
 		let mut content = vec![self.timestamp_format as u8];
 
 		let mut sorted_events = Vec::from_iter(self.events.iter());
@@ -234,7 +234,7 @@ impl EventTimingCodesFrame {
 			content.extend(event.timestamp.to_be_bytes())
 		}
 
-		Ok(content)
+		content
 	}
 }
 
@@ -283,7 +283,7 @@ mod tests {
 
 	#[test]
 	fn etco_encode() {
-		let encoded = expected().as_bytes().unwrap();
+		let encoded = expected().as_bytes();
 
 		let expected_bytes =
 			crate::tag::utils::test_utils::read_path("tests/tags/assets/id3v2/test.etco");
diff --git a/src/id3/v2/items/ownership_frame.rs b/src/id3/v2/items/ownership_frame.rs
index 4522b06fe..8e53e23de 100644
--- a/src/id3/v2/items/ownership_frame.rs
+++ b/src/id3/v2/items/ownership_frame.rs
@@ -30,6 +30,11 @@ impl OwnershipFrame {
 	/// Read an [`OwnershipFrame`]
 	///
 	/// NOTE: This expects the frame header to have already been skipped
+	///
+	/// # Errors
+	///
+	/// * Invalid text encoding
+	/// * Not enough data
 	pub fn parse<R>(reader: &mut R) -> Result<Option<Self>>
 	where
 		R: Read,
diff --git a/src/id3/v2/items/private_frame.rs b/src/id3/v2/items/private_frame.rs
index 1616fbfda..808233b9a 100644
--- a/src/id3/v2/items/private_frame.rs
+++ b/src/id3/v2/items/private_frame.rs
@@ -20,6 +20,10 @@ impl PrivateFrame {
 	/// Read an [`PrivateFrame`]
 	///
 	/// NOTE: This expects the frame header to have already been skipped
+	///
+	/// # Errors
+	///
+	/// * Failure to read from `reader`
 	pub fn parse<R>(reader: &mut R) -> Result<Option<Self>>
 	where
 		R: Read,
diff --git a/src/id3/v2/items/relative_volume_adjustment_frame.rs b/src/id3/v2/items/relative_volume_adjustment_frame.rs
index 3aa6f8be3..012f7e6a6 100644
--- a/src/id3/v2/items/relative_volume_adjustment_frame.rs
+++ b/src/id3/v2/items/relative_volume_adjustment_frame.rs
@@ -101,6 +101,11 @@ impl RelativeVolumeAdjustmentFrame {
 	/// Read an [`RelativeVolumeAdjustmentFrame`]
 	///
 	/// NOTE: This expects the frame header to have already been skipped
+	///
+	/// # Errors
+	///
+	/// * Bad channel type (See [Id3v2ErrorKind::BadRva2ChannelType])
+	/// * Not enough data
 	pub fn parse<R>(reader: &mut R, parse_mode: ParsingMode) -> Result<Option<Self>>
 	where
 		R: Read,
@@ -156,11 +161,11 @@ impl RelativeVolumeAdjustmentFrame {
 			true,
 		));
 
-		for (_, info) in &self.channels {
+		for (channel_type, info) in &self.channels {
 			let mut bits_representing_peak = info.bits_representing_peak;
 			let expected_peak_byte_length = (bits_representing_peak + 7) >> 3;
 
-			content.push(info.channel_type as u8);
+			content.push(*channel_type as u8);
 			content.extend(info.volume_adjustment.to_be_bytes());
 
 			if info.peak_volume.is_none() {
diff --git a/src/lib.rs b/src/lib.rs
index 14532d228..335e9d198 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -138,6 +138,7 @@
 	clippy::field_reassign_with_default,
 	clippy::manual_range_patterns, /* This is not at all clearer as it suggests */
 	clippy::explicit_iter_loop,
+	clippy::from_iter_instead_of_collect
 )]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]