From dde21a2a606c479e96b454e9eba54084ae173b85 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Tue, 7 Jun 2022 17:28:05 -0400 Subject: [PATCH] chore: Fix latest Clippy warnings --- core/src/avm1/activation.rs | 2 +- core/src/avm1/globals/movie_clip.rs | 4 ++-- core/src/avm2/object/proxy_object.rs | 2 +- core/src/display_object.rs | 2 +- core/src/display_object/video.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/avm1/activation.rs b/core/src/avm1/activation.rs index 83bf6f4f5..16b5f712b 100644 --- a/core/src/avm1/activation.rs +++ b/core/src/avm1/activation.rs @@ -2934,7 +2934,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> { "Target not found: Target=\"{}\" Base=\"{}\"", target, match &path { - Some(p) => &*p, + Some(p) => p, None => WStr::from_units(b"?"), } ); diff --git a/core/src/avm1/globals/movie_clip.rs b/core/src/avm1/globals/movie_clip.rs index d3782ff2d..41ccae0a9 100644 --- a/core/src/avm1/globals/movie_clip.rs +++ b/core/src/avm1/globals/movie_clip.rs @@ -816,10 +816,10 @@ pub fn duplicate_movie_clip_with_bias<'gc>( parent.replace_at_depth(&mut activation.context, new_clip, depth); // Copy display properties from previous clip to new clip. - new_clip.set_matrix(activation.context.gc_context, &*movie_clip.base().matrix()); + new_clip.set_matrix(activation.context.gc_context, movie_clip.base().matrix()); new_clip.set_color_transform( activation.context.gc_context, - &*movie_clip.base().color_transform(), + movie_clip.base().color_transform(), ); new_clip.as_movie_clip().unwrap().set_clip_event_handlers( activation.context.gc_context, diff --git a/core/src/avm2/object/proxy_object.rs b/core/src/avm2/object/proxy_object.rs index 025469d93..8762c9bfe 100644 --- a/core/src/avm2/object/proxy_object.rs +++ b/core/src/avm2/object/proxy_object.rs @@ -86,7 +86,7 @@ impl<'gc> TObject<'gc> for ProxyObject<'gc> { return Ok(Value::Undefined); } - return Err(format!("Cannot get undefined property {:?}", multiname.local_name()).into()); + Err(format!("Cannot get undefined property {:?}", multiname.local_name()).into()) } fn set_property_local( diff --git a/core/src/display_object.rs b/core/src/display_object.rs index 33bfbee38..70eecc8f1 100644 --- a/core/src/display_object.rs +++ b/core/src/display_object.rs @@ -493,7 +493,7 @@ pub fn render_base<'gc>(this: DisplayObject<'gc>, context: &mut RenderContext<'_ if this.maskee().is_some() { return; } - context.transform_stack.push(&*this.base().transform()); + context.transform_stack.push(this.base().transform()); let mask = this.masker(); let mut mask_transform = crate::transform::Transform::default(); diff --git a/core/src/display_object/video.rs b/core/src/display_object/video.rs index f3616f760..e2dafb34c 100644 --- a/core/src/display_object/video.rs +++ b/core/src/display_object/video.rs @@ -443,7 +443,7 @@ impl<'gc> TDisplayObject<'gc> for Video<'gc> { return; } - context.transform_stack.push(&*self.base().transform()); + context.transform_stack.push(self.base().transform()); let read = self.0.read();