Merge pull request RustPython#1337 from palaviv/remove-arg-check-2

Convert more modules to new arg style

Author: windelbouwman

vm/src/obj/objfilter.rs

@@ -1,5 +1,5 @@
 use crate::pyobject::{IdProtocol, PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue};
-use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance
+use crate::vm::VirtualMachine;
 
 use super::objbool;
 use super::objiter;

vm/src/obj/objlist.rs

@@ -6,7 +6,7 @@ use std::ops::Range;
 use num_bigint::{BigInt, ToBigInt};
 use num_traits::{One, Signed, ToPrimitive, Zero};
 
-use crate::function::{OptionalArg, PyFuncArgs};
+use crate::function::OptionalArg;
 use crate::pyobject::{
     IdProtocol, PyClassImpl, PyContext, PyIterable, PyObjectRef, PyRef, PyResult, PyValue,
     TryFromObject,
@@ -17,8 +17,7 @@ use super::objbool;
 //use super::objint;
 use super::objiter;
 use super::objsequence::{
-    get_elements_cell, get_elements_list, get_item, seq_equal, seq_ge, seq_gt, seq_le, seq_lt,
-    seq_mul, SequenceIndex,
+    get_elements_list, get_item, seq_equal, seq_ge, seq_gt, seq_le, seq_lt, seq_mul, SequenceIndex,
 };
 use super::objslice::PySliceRef;
 use super::objtype;
@@ -99,6 +98,14 @@ impl PyList {
     }
 }
 
+#[derive(FromArgs)]
+struct SortOptions {
+    #[pyarg(keyword_only, default = "None")]
+    key: Option<PyObjectRef>,
+    #[pyarg(keyword_only, default = "false")]
+    reverse: bool,
+}
+
 pub type PyListRef = PyRef<PyList>;
 
 impl PyListRef {
@@ -687,6 +694,21 @@ impl PyListRef {
         // then drain (the values to delete should now be contiguous at teh start of the range)
         elements.drain(range.start..(range.start + deleted));
     }
+
+    fn sort(self, options: SortOptions, vm: &VirtualMachine) -> PyResult<()> {
+        // replace list contents with [] for duration of sort.
+        // this prevents keyfunc from messing with the list and makes it easy to
+        // check if it tries to append elements to it.
+        let mut elements = self.elements.replace(vec![]);
+        do_sort(vm, &mut elements, options.key, options.reverse)?;
+        let temp_elements = self.elements.replace(elements);
+
+        if !temp_elements.is_empty() {
+            return Err(vm.new_value_error("list modified during sort".to_string()));
+        }
+
+        Ok(())
+    }
 }
 
 fn list_new(
@@ -768,30 +790,6 @@ fn do_sort(
     Ok(())
 }
 
-fn list_sort(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
-    arg_check!(vm, args, required = [(list, Some(vm.ctx.list_type()))]);
-    let key_func = args.get_optional_kwarg("key");
-    let reverse = args.get_optional_kwarg("reverse");
-    let reverse = match reverse {
-        None => false,
-        Some(val) => objbool::boolval(vm, val)?,
-    };
-
-    let elements_cell = get_elements_cell(list);
-    // replace list contents with [] for duration of sort.
-    // this prevents keyfunc from messing with the list and makes it easy to
-    // check if it tries to append elements to it.
-    let mut elements = elements_cell.replace(vec![]);
-    do_sort(vm, &mut elements, key_func, reverse)?;
-    let temp_elements = elements_cell.replace(elements);
-
-    if !temp_elements.is_empty() {
-        return Err(vm.new_value_error("list modified during sort".to_string()));
-    }
-
-    Ok(vm.get_none())
-}
-
 #[pyclass]
 #[derive(Debug)]
 pub struct PyListIterator {
@@ -896,7 +894,7 @@ pub fn init(context: &PyContext) {
         "index" => context.new_rustfunc(PyListRef::index),
         "insert" => context.new_rustfunc(PyListRef::insert),
         "reverse" => context.new_rustfunc(PyListRef::reverse),
-        "sort" => context.new_rustfunc(list_sort),
+        "sort" => context.new_rustfunc(PyListRef::sort),
         "pop" => context.new_rustfunc(PyListRef::pop),
         "remove" => context.new_rustfunc(PyListRef::remove)
     });

vm/src/obj/objproperty.rs

@@ -1,7 +1,7 @@
 /*! Python `property` descriptor class.
 
 */
-use crate::function::{IntoPyNativeFunc, OptionalArg, PyFuncArgs};
+use crate::function::{IntoPyNativeFunc, OptionalArg};
 use crate::obj::objtype::PyClassRef;
 use crate::pyobject::{
     IdProtocol, PyClassImpl, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue,
@@ -91,30 +91,31 @@ impl PyValue for PyProperty {
 
 pub type PyPropertyRef = PyRef<PyProperty>;
 
+#[derive(FromArgs)]
+struct PropertyArgs {
+    #[pyarg(positional_or_keyword, default = "None")]
+    fget: Option<PyObjectRef>,
+    #[pyarg(positional_or_keyword, default = "None")]
+    fset: Option<PyObjectRef>,
+    #[pyarg(positional_or_keyword, default = "None")]
+    fdel: Option<PyObjectRef>,
+    #[pyarg(positional_or_keyword, default = "None")]
+    doc: Option<PyObjectRef>,
+}
+
 #[pyimpl]
 impl PyProperty {
     #[pymethod(name = "__new__")]
     fn new_property(
         cls: PyClassRef,
-        args: PyFuncArgs,
+        args: PropertyArgs,
         vm: &VirtualMachine,
     ) -> PyResult<PyPropertyRef> {
-        arg_check!(
-            vm,
-            args,
-            required = [],
-            optional = [(fget, None), (fset, None), (fdel, None), (doc, None)]
-        );
-
-        fn into_option(vm: &VirtualMachine, arg: Option<&PyObjectRef>) -> Option<PyObjectRef> {
-            arg.and_then(|arg| py_none_to_option(vm, arg))
-        }
-
         PyProperty {
-            getter: into_option(vm, fget),
-            setter: into_option(vm, fset),
-            deleter: into_option(vm, fdel),
-            doc: RefCell::new(into_option(vm, doc)),
+            getter: args.fget,
+            setter: args.fset,
+            deleter: args.fdel,
+            doc: RefCell::new(args.doc),
         }
         .into_ref_with_type(vm, cls)
     }