From 169c79fa3a5c5eb28a221712a3ef29a2c1871755 Mon Sep 17 00:00:00 2001
From: relrelb <relrelbachar@gmail.com>
Date: Sat, 26 Jun 2021 17:23:09 +0300
Subject: [PATCH] chore: Minor cleanups

---
 core/src/avm1.rs                       | 1 +
 core/src/backend/audio/decoders/pcm.rs | 1 +
 core/src/display_object/container.rs   | 2 +-
 swf/src/avm1/read.rs                   | 6 ++----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/avm1.rs b/core/src/avm1.rs
index cf08fd391..80a0f74c3 100644
--- a/core/src/avm1.rs
+++ b/core/src/avm1.rs
@@ -623,6 +623,7 @@ pub struct DisplayObjectIter<'gc> {
 
 impl<'gc> Iterator for DisplayObjectIter<'gc> {
     type Item = DisplayObject<'gc>;
+
     fn next(&mut self) -> Option<Self::Item> {
         let clip = self.clip;
         self.clip = clip.and_then(|clip| clip.next_avm1_clip());
diff --git a/core/src/backend/audio/decoders/pcm.rs b/core/src/backend/audio/decoders/pcm.rs
index 16df96ff4..8deb34c26 100644
--- a/core/src/backend/audio/decoders/pcm.rs
+++ b/core/src/backend/audio/decoders/pcm.rs
@@ -24,6 +24,7 @@ impl<R: Read> PcmDecoder<R> {
 
 impl<R: Read> Iterator for PcmDecoder<R> {
     type Item = [i16; 2];
+
     #[allow(unknown_lints, clippy::branches_sharing_code)]
     fn next(&mut self) -> Option<Self::Item> {
         if self.is_stereo {
diff --git a/core/src/display_object/container.rs b/core/src/display_object/container.rs
index 90518acd0..2adb06967 100644
--- a/core/src/display_object/container.rs
+++ b/core/src/display_object/container.rs
@@ -921,7 +921,7 @@ impl<'gc> RenderIter<'gc> {
 impl<'gc> Iterator for RenderIter<'gc> {
     type Item = DisplayObject<'gc>;
 
-    fn next(&mut self) -> Option<DisplayObject<'gc>> {
+    fn next(&mut self) -> Option<Self::Item> {
         if self.i == self.neg_i {
             return None;
         }
diff --git a/swf/src/avm1/read.rs b/swf/src/avm1/read.rs
index 2963eef5c..467620ed3 100644
--- a/swf/src/avm1/read.rs
+++ b/swf/src/avm1/read.rs
@@ -1,12 +1,10 @@
-#![allow(clippy::unreadable_literal)]
-
 use crate::avm1::{opcode::OpCode, types::*};
 use crate::error::{Error, Result};
 use crate::extensions::ReadSwfExt;
 
-#[allow(dead_code)]
 pub struct Reader<'a> {
     input: &'a [u8],
+    #[allow(dead_code)]
     version: u8,
 }
 
@@ -68,7 +66,7 @@ impl<'a> Reader<'a> {
     pub fn read_opcode_and_length(&mut self) -> Result<(u8, usize)> {
         let opcode = self.read_u8()?;
         let length = if opcode >= 0x80 {
-            self.read_u16()? as usize
+            self.read_u16()?.into()
         } else {
             0
         };