From 48d59c03402754bb608413a3bb8748d4972098fb Mon Sep 17 00:00:00 2001 From: paq <89paku@gmail.com> Date: Tue, 2 Feb 2021 23:04:10 +0900 Subject: [PATCH] chore: Minor refactor names.rs --- core/src/avm2/names.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/avm2/names.rs b/core/src/avm2/names.rs index c407c7743..288683fae 100644 --- a/core/src/avm2/names.rs +++ b/core/src/avm2/names.rs @@ -63,23 +63,23 @@ impl<'gc> Namespace<'gc> { } pub fn public() -> Self { - Namespace::Package("".into()) + Self::Package("".into()) } pub fn as3_namespace() -> Self { - Namespace::Namespace("http://adobe.com/AS3/2006/builtin".into()) + Self::Namespace("http://adobe.com/AS3/2006/builtin".into()) } pub fn package(package_name: impl Into>) -> Self { - Namespace::Package(package_name.into()) + Self::Package(package_name.into()) } pub fn private(name: impl Into>) -> Self { - Namespace::Private(name.into()) + Self::Private(name.into()) } pub fn is_public(&self) -> bool { - *self == Self::Package("".into()) + *self == Self::public() } pub fn is_any(&self) -> bool { @@ -91,7 +91,7 @@ impl<'gc> Namespace<'gc> { } pub fn is_dynamic(&self) -> bool { - self.eq(&Self::Package("".into())) || self.is_any() + self.is_public() || self.is_any() } /// Get the string value of this namespace, ignoring its type.