From 2c4b260a8c71111476ec0bababd363021c7e75b9 Mon Sep 17 00:00:00 2001 From: Adrian Wielgosik Date: Wed, 2 Feb 2022 23:07:34 +0100 Subject: [PATCH] chore: cargo fmt --- core/src/avm2/globals/namespace.rs | 6 +++++- core/src/avm2/globals/object.rs | 6 +++++- core/src/avm2/globals/regexp.rs | 7 +++++-- core/src/avm2/globals/vector.rs | 8 ++++++-- core/src/avm2/object/class_object.rs | 3 +-- core/src/avm2/value.rs | 2 +- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/core/src/avm2/globals/namespace.rs b/core/src/avm2/globals/namespace.rs index 150de3021..753747d14 100644 --- a/core/src/avm2/globals/namespace.rs +++ b/core/src/avm2/globals/namespace.rs @@ -65,7 +65,11 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc> "", mc, )); - write.set_call_handler(Method::from_builtin(class_call, "", mc)); + write.set_call_handler(Method::from_builtin( + class_call, + "", + mc, + )); class } diff --git a/core/src/avm2/globals/object.rs b/core/src/avm2/globals/object.rs index 9650146b0..4670bb3e0 100644 --- a/core/src/avm2/globals/object.rs +++ b/core/src/avm2/globals/object.rs @@ -274,7 +274,11 @@ pub fn create_class<'gc>(gc_context: MutationContext<'gc, '_>) -> GcCell<'gc, Cl gc_context, ); let mut write = object_class.write(gc_context); - write.set_call_handler(Method::from_builtin(class_call, "", gc_context)); + write.set_call_handler(Method::from_builtin( + class_call, + "", + gc_context, + )); write.define_class_trait(Trait::from_const( QName::new(Namespace::public(), "length"), diff --git a/core/src/avm2/globals/regexp.rs b/core/src/avm2/globals/regexp.rs index 854d35a7a..f921077db 100644 --- a/core/src/avm2/globals/regexp.rs +++ b/core/src/avm2/globals/regexp.rs @@ -56,7 +56,6 @@ fn class_call<'gc>( this: Option>, args: &[Value<'gc>], ) -> Result, Error> { - let this_class = activation.subclass_object().unwrap(); if args.len() == 1 { @@ -295,7 +294,11 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc> let mut write = class.write(mc); write.set_instance_allocator(regexp_allocator); - write.set_call_handler(Method::from_builtin(class_call, "", mc)); + write.set_call_handler(Method::from_builtin( + class_call, + "", + mc, + )); const PUBLIC_INSTANCE_PROPERTIES: &[( &str, diff --git a/core/src/avm2/globals/vector.rs b/core/src/avm2/globals/vector.rs index 48b57de8a..241d5b60d 100644 --- a/core/src/avm2/globals/vector.rs +++ b/core/src/avm2/globals/vector.rs @@ -8,7 +8,7 @@ use crate::avm2::globals::array::{ }; use crate::avm2::globals::NS_VECTOR; use crate::avm2::method::{Method, NativeMethodImpl}; -use crate::avm2::names::{Namespace, QName, Multiname}; +use crate::avm2::names::{Multiname, Namespace, QName}; use crate::avm2::object::{vector_allocator, FunctionObject, Object, TObject, VectorObject}; use crate::avm2::value::Value; use crate::avm2::vector::VectorStorage; @@ -1046,7 +1046,11 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc> "", mc, )); - write.set_call_handler(Method::from_builtin(class_call, "", mc)); + write.set_call_handler(Method::from_builtin( + class_call, + "", + mc, + )); const PUBLIC_INSTANCE_PROPERTIES: &[( &str, diff --git a/core/src/avm2/object/class_object.rs b/core/src/avm2/object/class_object.rs index 834b394c4..e141c1f7d 100644 --- a/core/src/avm2/object/class_object.rs +++ b/core/src/avm2/object/class_object.rs @@ -760,8 +760,7 @@ impl<'gc> TObject<'gc> for ClassObject<'gc> { ) -> Result, Error> { if let Some(call_handler) = self.0.read().call_handler.clone() { let scope = self.0.read().class_scope; - let func = - Executable::from_method(call_handler, scope, None, Some(self)); + let func = Executable::from_method(call_handler, scope, None, Some(self)); func.exec(receiver, arguments, activation, self.into()) } else { diff --git a/core/src/avm2/value.rs b/core/src/avm2/value.rs index 6b40892a8..868982d8b 100644 --- a/core/src/avm2/value.rs +++ b/core/src/avm2/value.rs @@ -573,7 +573,7 @@ impl<'gc> Value<'gc> { pub fn as_object(&self) -> Option> { match self { Value::Object(o) => Some(*o), - _ => None + _ => None, } }