Convert PyFuncArgs.kwargs to a Vec

Instead of an Option<Vec>

Author: OddBloke

vm/src/builtins.rs

@@ -419,7 +419,7 @@ pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> Py
         function,
         PyFuncArgs {
             args: vec![namespace.clone()],
-            kwargs: None,
+            kwargs: vec![],
         },
     );
     objtype::new(metaclass, name, bases, namespace)

vm/src/obj/objtype.rs

@@ -131,7 +131,7 @@ pub fn get_attribute(vm: &mut VirtualMachine, obj: PyObjectRef, name: &String) -
                 descriptor,
                 PyFuncArgs {
                     args: vec![attr, obj, cls],
-                    kwargs: None,
+                    kwargs: vec![],
                 },
             );
         }

vm/src/pyobject.rs

@@ -512,7 +512,7 @@ impl fmt::Debug for PyObject {
 #[derive(Debug, Default, Clone)]
 pub struct PyFuncArgs {
     pub args: Vec<PyObjectRef>,
-    pub kwargs: Option<Vec<(String, PyObjectRef)>>,
+    pub kwargs: Vec<(String, PyObjectRef)>,
 }
 
 impl PyFuncArgs {
@@ -523,7 +523,7 @@ impl PyFuncArgs {
         }
         PyFuncArgs {
             args: args,
-            kwargs: Some(kwargs),
+            kwargs: kwargs,
         }
     }
 

vm/src/vm.rs

@@ -63,7 +63,7 @@ impl VirtualMachine {
         let args: Vec<PyObjectRef> = Vec::new();
         let args = PyFuncArgs {
             args: args,
-            kwargs: None,
+            kwargs: vec![],
         };
 
         // Call function:
@@ -270,7 +270,7 @@ impl VirtualMachine {
                         self,
                         PyFuncArgs {
                             args: vec![traceback, pos],
-                            kwargs: None,
+                            kwargs: vec![],
                         },
                     ).unwrap();
                     // exception.__trace
@@ -354,7 +354,7 @@ impl VirtualMachine {
         };
         let args = PyFuncArgs {
             args: args,
-            kwargs: None,
+            kwargs: vec![],
         };
         self.invoke(func, args)
     }
@@ -503,7 +503,7 @@ impl VirtualMachine {
         }
     }
 
-    pub fn invoke(&mut self, func_ref: PyObjectRef, mut args: PyFuncArgs) -> PyResult {
+    pub fn invoke(&mut self, func_ref: PyObjectRef, args: PyFuncArgs) -> PyResult {
         trace!("Invoke: {:?} {:?}", func_ref, args);
         match func_ref.borrow().kind {
             PyObjectKind::RustFunction { function } => function(self, args),
@@ -534,22 +534,20 @@ impl VirtualMachine {
                 // TODO: Pack other positional arguments in to *args
 
                 // Handle keyword arguments
-                if let Some(ref mut kwargs) = args.kwargs {
-                    for (name, value) in kwargs {
-                        if !code_object.arg_names.contains(&name) {
-                            return Err(self.new_type_error(format!(
-                                "Got an unexpected keyword argument '{}'",
-                                name
-                            )));
-                        }
-                        if scope.contains_key(&name) {
-                            return Err(self.new_type_error(format!(
-                                "Got multiple values for argument '{}'",
-                                name
-                            )));
-                        }
-                        scope.set_item(&name, value.clone());
+                for (name, value) in args.kwargs {
+                    if !code_object.arg_names.contains(&name) {
+                        return Err(self.new_type_error(format!(
+                            "Got an unexpected keyword argument '{}'",
+                            name
+                        )));
+                    }
+                    if scope.contains_key(&name) {
+                        return Err(self.new_type_error(format!(
+                            "Got multiple values for argument '{}'",
+                            name
+                        )));
                     }
+                    scope.set_item(&name, value.clone());
                 }
 
                 // Add missing positional arguments, if we have fewer positional arguments than the
@@ -870,7 +868,7 @@ impl VirtualMachine {
                 let args: Vec<PyObjectRef> = self.pop_multiple(*count);
                 let args = PyFuncArgs {
                     args: args,
-                    kwargs: None,
+                    kwargs: vec![],
                 };
                 let func_ref = self.pop_value();
 
@@ -997,7 +995,7 @@ impl VirtualMachine {
                             self,
                             PyFuncArgs {
                                 args: vec![expr.clone()],
-                                kwargs: None,
+                                kwargs: vec![],
                             },
                         ).unwrap();
                     }