From 20d6fcc128a68bfb877b9dffeaf5ce6c297cd032 Mon Sep 17 00:00:00 2001 From: relrelb Date: Fri, 12 Mar 2021 15:41:16 +0200 Subject: [PATCH] chore: Remove unnecessary type annotations --- core/src/avm2/events.rs | 16 ++-------- core/src/avm2/globals/flash/events/event.rs | 2 +- core/src/avm2/object/event_object.rs | 2 +- core/src/backend/audio/decoders/adpcm.rs | 2 +- render/webgl/src/lib.rs | 2 +- swf/src/avm2/read.rs | 1 + swf/src/extensions.rs | 34 ++++++++++----------- swf/src/read.rs | 2 +- swf/src/write.rs | 2 +- 9 files changed, 26 insertions(+), 37 deletions(-) diff --git a/core/src/avm2/events.rs b/core/src/avm2/events.rs index 027b703db..ab01cf47a 100644 --- a/core/src/avm2/events.rs +++ b/core/src/avm2/events.rs @@ -17,24 +17,14 @@ use std::hash::{Hash, Hasher}; pub enum EventPhase { /// The event has yet to be fired on the target and is descending the /// ancestors of the event target. - Capturing, + Capturing = 1, /// The event is currently firing on the target. - AtTarget, + AtTarget = 2, /// The event has already fired on the target and is ascending the /// ancestors of the event target. - Bubbling, -} - -impl From for u32 { - fn from(event: EventPhase) -> u32 { - match event { - EventPhase::Capturing => 1, - EventPhase::AtTarget => 2, - EventPhase::Bubbling => 3, - } - } + Bubbling = 3, } /// How this event is allowed to propagate. diff --git a/core/src/avm2/globals/flash/events/event.rs b/core/src/avm2/globals/flash/events/event.rs index 3dea8a4e3..a4d77d272 100644 --- a/core/src/avm2/globals/flash/events/event.rs +++ b/core/src/avm2/globals/flash/events/event.rs @@ -130,7 +130,7 @@ pub fn event_phase<'gc>( _args: &[Value<'gc>], ) -> Result, Error> { if let Some(evt) = this.unwrap().as_event() { - let event_phase: u32 = evt.phase().into(); + let event_phase = evt.phase() as u32; return Ok(event_phase.into()); } diff --git a/core/src/avm2/object/event_object.rs b/core/src/avm2/object/event_object.rs index f28d727d5..15fae0654 100644 --- a/core/src/avm2/object/event_object.rs +++ b/core/src/avm2/object/event_object.rs @@ -102,7 +102,7 @@ impl<'gc> TObject<'gc> for EventObject<'gc> { let event_type = read.event.event_type(); let bubbles = read.event.is_bubbling(); let cancelable = read.event.is_cancelable(); - let phase: u32 = read.event.phase().into(); + let phase = read.event.phase() as u32; Ok(AvmString::new( mc, diff --git a/core/src/backend/audio/decoders/adpcm.rs b/core/src/backend/audio/decoders/adpcm.rs index c4b512652..386ed1cfa 100644 --- a/core/src/backend/audio/decoders/adpcm.rs +++ b/core/src/backend/audio/decoders/adpcm.rs @@ -134,7 +134,7 @@ impl AdpcmDecoder { self.sample_num = (self.sample_num + 1) % 4095; - let data: i32 = self.inner.read::(self.bits_per_sample as u32)? as i32; + let data = self.inner.read::(self.bits_per_sample as u32)? as i32; self.left_step = Self::STEP_TABLE[self.left_step_index as usize]; // (data + 0.5) * step / 2^(bits_per_sample - 2) diff --git a/render/webgl/src/lib.rs b/render/webgl/src/lib.rs index 78add2273..d13ea7cf4 100644 --- a/render/webgl/src/lib.rs +++ b/render/webgl/src/lib.rs @@ -132,7 +132,7 @@ impl WebGlRenderBackend { // Ensure that we don't exceed the max MSAA of this device. if let Ok(max_samples) = gl2.get_parameter(Gl2::MAX_SAMPLES) { - let max_samples: u32 = max_samples.as_f64().unwrap_or(0.0) as u32; + let max_samples = max_samples.as_f64().unwrap_or(0.0) as u32; if max_samples > 0 && max_samples < msaa_sample_count { log::info!("Device only supports {}xMSAA", max_samples); msaa_sample_count = max_samples; diff --git a/swf/src/avm2/read.rs b/swf/src/avm2/read.rs index 45075a95c..d6a9938da 100644 --- a/swf/src/avm2/read.rs +++ b/swf/src/avm2/read.rs @@ -92,6 +92,7 @@ impl<'a> Reader<'a> { | (i32::from(self.read_u8()? as i8) << 8) | (i32::from(self.read_u8()? as i8) << 16)) } + fn read_i32(&mut self) -> Result { self.read_encoded_i32() } diff --git a/swf/src/extensions.rs b/swf/src/extensions.rs index b791cdc0f..271faec01 100644 --- a/swf/src/extensions.rs +++ b/swf/src/extensions.rs @@ -67,21 +67,21 @@ pub trait ReadSwfExt<'a> { #[inline] fn read_fixed8(&mut self) -> Result { - ReadSwfExt::read_i16(self).map(|n| f32::from(n) / 256f32) + Ok((self.read_i16()? as f32) / 256.0) } #[inline] fn read_fixed16(&mut self) -> Result { - ReadSwfExt::read_i32(self).map(|n| f64::from(n) / 65536f64) + Ok((self.read_i32()? as f64) / 65536.0) } #[inline] fn read_encoded_u32(&mut self) -> Result { - let mut val = 0u32; - for i in 0..5 { - let byte = ReadSwfExt::read_u8(self)?; - val |= u32::from(byte & 0b01111111) << (i * 7); - if byte & 0b10000000 == 0 { + let mut val: u32 = 0; + for i in (0..35).step_by(7) { + let byte = self.read_u8()? as u32; + val |= (byte & 0b0111_1111) << i; + if byte & 0b1000_0000 == 0 { break; } } @@ -90,23 +90,21 @@ pub trait ReadSwfExt<'a> { #[inline] fn read_encoded_i32(&mut self) -> Result { - let mut n: i32 = 0; - let mut i = 0; - for _ in 0..5 { - let byte: i32 = self.read_u8()?.into(); - n |= (byte & 0b0111_1111) << i; - i += 7; - + let mut val: i32 = 0; + for i in (0..35).step_by(7) { + let byte = self.read_u8()? as i32; + val |= (byte & 0b0111_1111) << i; if byte & 0b1000_0000 == 0 { + let i = i + 7; if i < 32 { - n <<= 32 - i; - n >>= 32 - i; + // Perform sign-extension to allow negative values. + val <<= 32 - i; + val >>= 32 - i; } - break; } } - Ok(n) + Ok(val) } #[inline] diff --git a/swf/src/read.rs b/swf/src/read.rs index 8c584e9e3..2cfc5d84e 100644 --- a/swf/src/read.rs +++ b/swf/src/read.rs @@ -560,7 +560,7 @@ impl<'a> Reader<'a> { pub fn read_rectangle(&mut self) -> Result { let mut bits = self.bits(); - let num_bits: u32 = bits.read_ubits(5)?; + let num_bits = bits.read_ubits(5)?; Ok(Rectangle { x_min: bits.read_sbits_twips(num_bits)?, x_max: bits.read_sbits_twips(num_bits)?, diff --git a/swf/src/write.rs b/swf/src/write.rs index 037dc2145..75780d463 100644 --- a/swf/src/write.rs +++ b/swf/src/write.rs @@ -2594,7 +2594,7 @@ impl Writer { fn write_tag_code_and_length(&mut self, tag_code: u16, length: u32) -> Result<()> { // TODO: Test for tag code/length overflow. - let mut tag_code_and_length: u16 = tag_code << 6; + let mut tag_code_and_length = tag_code << 6; if length < 0b111111 { tag_code_and_length |= length as u16; self.write_u16(tag_code_and_length)?;