diff --git a/core/src/avm2/globals/object.rs b/core/src/avm2/globals/object.rs index 4670bb3e0..f66eca3b7 100644 --- a/core/src/avm2/globals/object.rs +++ b/core/src/avm2/globals/object.rs @@ -21,12 +21,12 @@ pub fn instance_init<'gc>( fn class_call<'gc>( activation: &mut Activation<'_, 'gc, '_>, - this: Option>, + _this: Option>, args: &[Value<'gc>], ) -> Result, Error> { let this_class = activation.subclass_object().unwrap(); - if args.len() == 0 { + if args.is_empty() { return this_class.construct(activation, args).map(|o| o.into()); } let arg = args.get(0).cloned().unwrap(); diff --git a/core/src/avm2/globals/regexp.rs b/core/src/avm2/globals/regexp.rs index f921077db..3d173719b 100644 --- a/core/src/avm2/globals/regexp.rs +++ b/core/src/avm2/globals/regexp.rs @@ -53,15 +53,15 @@ pub fn instance_init<'gc>( fn class_call<'gc>( activation: &mut Activation<'_, 'gc, '_>, - this: Option>, + _this: Option>, args: &[Value<'gc>], ) -> Result, Error> { let this_class = activation.subclass_object().unwrap(); if args.len() == 1 { let arg = args.get(0).cloned().unwrap(); - if let Some(_) = arg.as_object().and_then(|o| o.as_regexp_object()) { - return Ok(arg.into()); + if arg.as_object().and_then(|o| o.as_regexp_object()).is_some() { + return Ok(arg); } } return this_class.construct(activation, args).map(|o| o.into()); diff --git a/core/src/avm2/globals/vector.rs b/core/src/avm2/globals/vector.rs index 241d5b60d..6337bb174 100644 --- a/core/src/avm2/globals/vector.rs +++ b/core/src/avm2/globals/vector.rs @@ -48,7 +48,7 @@ pub fn instance_init<'gc>( fn class_call<'gc>( activation: &mut Activation<'_, 'gc, '_>, - this: Option>, + _this: Option>, args: &[Value<'gc>], ) -> Result, Error> { if args.len() != 1 {