Rename `trait.rs` to `traits.rs` to avoid the use of reserved keyword syntax.
This commit is contained in:
parent
7b7f0b20e6
commit
4c824fcefe
|
@ -36,7 +36,7 @@ mod scope;
|
||||||
mod script;
|
mod script;
|
||||||
mod slot;
|
mod slot;
|
||||||
mod string;
|
mod string;
|
||||||
mod r#trait;
|
mod traits;
|
||||||
mod value;
|
mod value;
|
||||||
|
|
||||||
/// Boxed error alias.
|
/// Boxed error alias.
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
|
|
||||||
use crate::avm2::method::Method;
|
use crate::avm2::method::Method;
|
||||||
use crate::avm2::names::{Multiname, Namespace, QName};
|
use crate::avm2::names::{Multiname, Namespace, QName};
|
||||||
use crate::avm2::r#trait::{Trait, TraitKind};
|
|
||||||
use crate::avm2::script::TranslationUnit;
|
use crate::avm2::script::TranslationUnit;
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::{Trait, TraitKind};
|
||||||
use crate::avm2::{Avm2, Error};
|
use crate::avm2::{Avm2, Error};
|
||||||
use crate::collect::CollectWrapper;
|
use crate::collect::CollectWrapper;
|
||||||
use enumset::{EnumSet, EnumSetType};
|
use enumset::{EnumSet, EnumSetType};
|
||||||
|
|
|
@ -5,9 +5,9 @@ use crate::avm2::class::Class;
|
||||||
use crate::avm2::method::NativeMethod;
|
use crate::avm2::method::NativeMethod;
|
||||||
use crate::avm2::names::{Namespace, QName};
|
use crate::avm2::names::{Namespace, QName};
|
||||||
use crate::avm2::object::{FunctionObject, Object, ScriptObject, TObject};
|
use crate::avm2::object::{FunctionObject, Object, ScriptObject, TObject};
|
||||||
use crate::avm2::r#trait::Trait;
|
|
||||||
use crate::avm2::scope::Scope;
|
use crate::avm2::scope::Scope;
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::Trait;
|
||||||
use crate::avm2::value::Value;
|
use crate::avm2::value::Value;
|
||||||
use crate::avm2::Error;
|
use crate::avm2::Error;
|
||||||
use gc_arena::{Collect, GcCell, MutationContext};
|
use gc_arena::{Collect, GcCell, MutationContext};
|
||||||
|
|
|
@ -4,9 +4,9 @@ use crate::avm2::activation::Activation;
|
||||||
use crate::avm2::class::Class;
|
use crate::avm2::class::Class;
|
||||||
use crate::avm2::function::Executable;
|
use crate::avm2::function::Executable;
|
||||||
use crate::avm2::names::{Multiname, Namespace, QName};
|
use crate::avm2::names::{Multiname, Namespace, QName};
|
||||||
use crate::avm2::r#trait::{Trait, TraitKind};
|
|
||||||
use crate::avm2::scope::Scope;
|
use crate::avm2::scope::Scope;
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::{Trait, TraitKind};
|
||||||
use crate::avm2::value::{Hint, Value};
|
use crate::avm2::value::{Hint, Value};
|
||||||
use crate::avm2::Error;
|
use crate::avm2::Error;
|
||||||
use gc_arena::{Collect, GcCell, MutationContext};
|
use gc_arena::{Collect, GcCell, MutationContext};
|
||||||
|
|
|
@ -7,9 +7,9 @@ use crate::avm2::method::{Method, NativeMethod};
|
||||||
use crate::avm2::names::{Namespace, QName};
|
use crate::avm2::names::{Namespace, QName};
|
||||||
use crate::avm2::object::script_object::{ScriptObject, ScriptObjectClass, ScriptObjectData};
|
use crate::avm2::object::script_object::{ScriptObject, ScriptObjectClass, ScriptObjectData};
|
||||||
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
||||||
use crate::avm2::r#trait::Trait;
|
|
||||||
use crate::avm2::scope::Scope;
|
use crate::avm2::scope::Scope;
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::Trait;
|
||||||
use crate::avm2::value::Value;
|
use crate::avm2::value::Value;
|
||||||
use crate::avm2::Error;
|
use crate::avm2::Error;
|
||||||
use crate::impl_avm2_custom_object;
|
use crate::impl_avm2_custom_object;
|
||||||
|
|
|
@ -6,8 +6,8 @@ use crate::avm2::class::Class;
|
||||||
use crate::avm2::names::{Namespace, QName};
|
use crate::avm2::names::{Namespace, QName};
|
||||||
use crate::avm2::object::script_object::{ScriptObjectClass, ScriptObjectData};
|
use crate::avm2::object::script_object::{ScriptObjectClass, ScriptObjectData};
|
||||||
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
||||||
use crate::avm2::r#trait::Trait;
|
|
||||||
use crate::avm2::scope::Scope;
|
use crate::avm2::scope::Scope;
|
||||||
|
use crate::avm2::traits::Trait;
|
||||||
use crate::avm2::value::Value;
|
use crate::avm2::value::Value;
|
||||||
use crate::avm2::Error;
|
use crate::avm2::Error;
|
||||||
use crate::impl_avm2_custom_object;
|
use crate::impl_avm2_custom_object;
|
||||||
|
|
|
@ -5,9 +5,9 @@ use crate::avm2::class::Class;
|
||||||
use crate::avm2::names::{Namespace, QName};
|
use crate::avm2::names::{Namespace, QName};
|
||||||
use crate::avm2::object::script_object::{ScriptObjectClass, ScriptObjectData};
|
use crate::avm2::object::script_object::{ScriptObjectClass, ScriptObjectData};
|
||||||
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
||||||
use crate::avm2::r#trait::Trait;
|
|
||||||
use crate::avm2::scope::Scope;
|
use crate::avm2::scope::Scope;
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::Trait;
|
||||||
use crate::avm2::value::Value;
|
use crate::avm2::value::Value;
|
||||||
use crate::avm2::Error;
|
use crate::avm2::Error;
|
||||||
use crate::impl_avm2_custom_object;
|
use crate::impl_avm2_custom_object;
|
||||||
|
|
|
@ -7,11 +7,11 @@ use crate::avm2::names::{Namespace, QName};
|
||||||
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
use crate::avm2::object::{Object, ObjectPtr, TObject};
|
||||||
use crate::avm2::property::Property;
|
use crate::avm2::property::Property;
|
||||||
use crate::avm2::property_map::PropertyMap;
|
use crate::avm2::property_map::PropertyMap;
|
||||||
use crate::avm2::r#trait::Trait;
|
|
||||||
use crate::avm2::return_value::ReturnValue;
|
use crate::avm2::return_value::ReturnValue;
|
||||||
use crate::avm2::scope::Scope;
|
use crate::avm2::scope::Scope;
|
||||||
use crate::avm2::slot::Slot;
|
use crate::avm2::slot::Slot;
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::Trait;
|
||||||
use crate::avm2::value::Value;
|
use crate::avm2::value::Value;
|
||||||
use crate::avm2::Error;
|
use crate::avm2::Error;
|
||||||
use gc_arena::{Collect, GcCell, MutationContext};
|
use gc_arena::{Collect, GcCell, MutationContext};
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
use crate::avm2::class::Class;
|
use crate::avm2::class::Class;
|
||||||
use crate::avm2::method::{BytecodeMethod, Method};
|
use crate::avm2::method::{BytecodeMethod, Method};
|
||||||
use crate::avm2::r#trait::Trait;
|
|
||||||
use crate::avm2::string::AvmString;
|
use crate::avm2::string::AvmString;
|
||||||
|
use crate::avm2::traits::Trait;
|
||||||
use crate::avm2::{Avm2, Error};
|
use crate::avm2::{Avm2, Error};
|
||||||
use crate::collect::CollectWrapper;
|
use crate::collect::CollectWrapper;
|
||||||
use fnv::FnvHashMap;
|
use fnv::FnvHashMap;
|
||||||
|
|
Loading…
Reference in New Issue