avm2: Remove redundant traits parameter of VTable::init_vtable
This commit is contained in:
parent
8d25be4639
commit
243c6b8ba5
|
@ -743,7 +743,6 @@ impl<'gc> Class<'gc> {
|
||||||
read.vtable.init_vtable(
|
read.vtable.init_vtable(
|
||||||
self,
|
self,
|
||||||
None,
|
None,
|
||||||
&read.traits,
|
|
||||||
None,
|
None,
|
||||||
read.super_class.map(|c| c.vtable()),
|
read.super_class.map(|c| c.vtable()),
|
||||||
context.gc_context,
|
context.gc_context,
|
||||||
|
|
|
@ -662,7 +662,6 @@ pub fn load_player_globals<'gc>(
|
||||||
global_obj_vtable.init_vtable(
|
global_obj_vtable.init_vtable(
|
||||||
global_classdef,
|
global_classdef,
|
||||||
Some(object_class),
|
Some(object_class),
|
||||||
&global_classdef.traits(),
|
|
||||||
Some(scope),
|
Some(scope),
|
||||||
Some(object_class.instance_vtable()),
|
Some(object_class.instance_vtable()),
|
||||||
mc,
|
mc,
|
||||||
|
|
|
@ -211,7 +211,6 @@ impl<'gc> ClassObject<'gc> {
|
||||||
self.instance_vtable().init_vtable(
|
self.instance_vtable().init_vtable(
|
||||||
class,
|
class,
|
||||||
self.superclass_object(),
|
self.superclass_object(),
|
||||||
&class.traits(),
|
|
||||||
Some(self.instance_scope()),
|
Some(self.instance_scope()),
|
||||||
self.superclass_object().map(|cls| cls.instance_vtable()),
|
self.superclass_object().map(|cls| cls.instance_vtable()),
|
||||||
activation.context.gc_context,
|
activation.context.gc_context,
|
||||||
|
@ -254,7 +253,6 @@ impl<'gc> ClassObject<'gc> {
|
||||||
class_vtable.init_vtable(
|
class_vtable.init_vtable(
|
||||||
c_class,
|
c_class,
|
||||||
Some(class_classobject),
|
Some(class_classobject),
|
||||||
&c_class.traits(),
|
|
||||||
Some(self.class_scope()),
|
Some(self.class_scope()),
|
||||||
Some(class_classobject.instance_vtable()),
|
Some(class_classobject.instance_vtable()),
|
||||||
activation.context.gc_context,
|
activation.context.gc_context,
|
||||||
|
|
|
@ -553,7 +553,6 @@ impl<'gc> Script<'gc> {
|
||||||
global_obj_vtable.init_vtable(
|
global_obj_vtable.init_vtable(
|
||||||
global_class,
|
global_class,
|
||||||
Some(object_class),
|
Some(object_class),
|
||||||
&global_class.traits(),
|
|
||||||
Some(scope),
|
Some(scope),
|
||||||
Some(object_class.instance_vtable()),
|
Some(object_class.instance_vtable()),
|
||||||
mc,
|
mc,
|
||||||
|
|
|
@ -212,7 +212,6 @@ impl<'gc> VTable<'gc> {
|
||||||
self,
|
self,
|
||||||
defining_class_def: Class<'gc>,
|
defining_class_def: Class<'gc>,
|
||||||
super_class_obj: Option<ClassObject<'gc>>,
|
super_class_obj: Option<ClassObject<'gc>>,
|
||||||
traits: &[Trait<'gc>],
|
|
||||||
scope: Option<ScopeChain<'gc>>,
|
scope: Option<ScopeChain<'gc>>,
|
||||||
superclass_vtable: Option<Self>,
|
superclass_vtable: Option<Self>,
|
||||||
mc: &Mutation<'gc>,
|
mc: &Mutation<'gc>,
|
||||||
|
@ -316,7 +315,7 @@ impl<'gc> VTable<'gc> {
|
||||||
&mut write.slot_classes,
|
&mut write.slot_classes,
|
||||||
);
|
);
|
||||||
|
|
||||||
for trait_data in traits {
|
for trait_data in &*defining_class_def.traits() {
|
||||||
match trait_data.kind() {
|
match trait_data.kind() {
|
||||||
TraitKind::Method { method, .. } => {
|
TraitKind::Method { method, .. } => {
|
||||||
let entry = ClassBoundMethod {
|
let entry = ClassBoundMethod {
|
||||||
|
|
Loading…
Reference in New Issue