refactor: Make extra_args a constant

Author: Marwes

vm/src/api/function.rs

@@ -358,13 +358,13 @@ vm_function_impl!([dyn Fn] $($args),*);
 
 impl <'vm, $($args,)* R: VmType> FunctionType for fn ($($args),*) -> R {
     fn arguments() -> VmIndex {
-        count!($($args),*) + R::extra_args()
+        count!($($args),*) + R::EXTRA_ARGS
     }
 }
 
 impl <'s, $($args,)* R: VmType> FunctionType for dyn Fn($($args),*) -> R + 's {
     fn arguments() -> VmIndex {
-        count!($($args),*) + R::extra_args()
+        count!($($args),*) + R::EXTRA_ARGS
     }
 }
 
@@ -400,10 +400,10 @@ impl<T, $($args,)* R> Function<T, fn($($args),*) -> R>
         $(
             $args.push(&mut context)?;
         )*
-        for _ in 0..R::extra_args() {
+        for _ in 0..R::EXTRA_ARGS {
             0.push(&mut context).unwrap();
         }
-        let args = count!($($args),*) + R::extra_args();
+        let args = count!($($args),*) + R::EXTRA_ARGS;
         let context =  ready!(vm.call_function(cx, context.into_owned(), args))?;
         let mut context = context.unwrap();
         let result = {
@@ -510,12 +510,12 @@ where
         let mut context = vm.current_context();
         context.push(self.value.get_variant());
 
-        let mut arg_count = R::extra_args();
+        let mut arg_count = R::EXTRA_ARGS;
         for arg in args {
             arg_count += 1;
             arg.push(&mut context)?;
         }
-        for _ in 0..R::extra_args() {
+        for _ in 0..R::EXTRA_ARGS {
             0.push(&mut context).unwrap();
         }
         let context = ready!(vm.call_function(cx, context.into_owned(), arg_count))?;
@@ -561,9 +561,7 @@ impl<T: VmType> VmType for TypedBytecode<T> {
         T::make_forall_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 
 impl<'vm, T: VmType> Pushable<'vm> for TypedBytecode<T> {

vm/src/api/mod.rs

@@ -321,9 +321,7 @@ impl<T: VmType> VmType for Unrooted<T> {
         T::make_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 impl<'vm, T: VmType> Pushable<'vm> for Unrooted<T> {
     fn push(self, context: &mut ActiveThread<'vm>) -> Result<()> {
@@ -460,9 +458,7 @@ pub trait VmType {
     /// How many extra arguments a function returning this type requires.
     /// Used for abstract types which when used in return position should act like they still need
     /// more arguments before they are called
-    fn extra_args() -> VmIndex {
-        0
-    }
+    const EXTRA_ARGS: VmIndex = 0;
 }
 
 /// Trait which allows a possibly asynchronous rust value to be pushed to the virtual machine
@@ -617,9 +613,7 @@ impl<'vm, T: ?Sized + VmType> VmType for PhantomData<T> {
     fn make_type(vm: &Thread) -> ArcType {
         T::make_type(vm)
     }
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 
 /// Wrapper which extracts a `Userdata` value from gluon
@@ -640,9 +634,7 @@ where
         T::make_forall_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 
 impl<'vm, 'value, T> Getable<'vm, 'value> for UserdataValue<T>
@@ -783,9 +775,7 @@ where
         T::make_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 
 impl<'vm, T> Pushable<'vm> for WithVM<'vm, T>
@@ -1470,9 +1460,7 @@ where
     fn make_type(vm: &Thread) -> ArcType {
         <F::Output>::make_type(vm)
     }
-    fn extra_args() -> VmIndex {
-        <F::Output>::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = F::Output::EXTRA_ARGS;
 }
 
 impl<'vm, F> AsyncPushable<'vm> for FutureResult<F>
@@ -1519,9 +1507,7 @@ impl<T: VmType, E> VmType for RuntimeResult<T, E> {
         T::make_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 impl<'vm, T: Pushable<'vm>, E: fmt::Display> Pushable<'vm> for RuntimeResult<T, E> {
     fn push(self, context: &mut ActiveThread<'vm>) -> Result<()> {
@@ -1552,9 +1538,8 @@ where
         let alias = env.find_type_info("std.io.IO").unwrap();
         Type::app(alias.into_type(), collect![T::make_type(vm)])
     }
-    fn extra_args() -> VmIndex {
-        1
-    }
+
+    const EXTRA_ARGS: VmIndex = 1;
 }
 
 impl<'vm, 'value, T: Getable<'vm, 'value>> Getable<'vm, 'value> for IO<T> {
@@ -1750,9 +1735,7 @@ impl<T: VmType> VmType for Pushed<T> {
         T::make_forall_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        T::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = T::EXTRA_ARGS;
 }
 
 impl<'vm, T: VmType> Pushable<'vm> for Pushed<T> {

vm/src/api/opaque.rs

@@ -361,9 +361,7 @@ where
         V::make_type(vm)
     }
 
-    fn extra_args() -> VmIndex {
-        V::extra_args()
-    }
+    const EXTRA_ARGS: VmIndex = V::EXTRA_ARGS;
 }
 
 impl<'s, 'value, 'vm, T, V> Pushable<'vm> for Opaque<T, V>