Allow None parameter for remove, index, count method of array

Author: clemado1

Lib/test/test_array.py

@@ -918,8 +918,6 @@ def test_extended_set_del_slice(self):
                     del a[start:stop:step]
                     self.assertEqual(a, array.array(self.typecode, L))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_index(self):
         example = 2*self.example
         a = array.array(self.typecode, example)
@@ -929,8 +927,6 @@ def test_index(self):
         self.assertRaises(ValueError, a.index, None)
         self.assertRaises(ValueError, a.index, self.outside)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_count(self):
         example = 2*self.example
         a = array.array(self.typecode, example)
@@ -940,8 +936,6 @@ def test_count(self):
         self.assertEqual(a.count(self.outside), 0)
         self.assertEqual(a.count(None), 0)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_remove(self):
         for x in self.example:
             example = 2*self.example

vm/src/stdlib/array.rs

@@ -99,20 +99,25 @@ macro_rules! def_array_enum {
             fn count(&self, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
                 match self {
                     $(ArrayContentType::$n(v) => {
-                        let val = $t::try_from_object(vm, obj)?;
-                        Ok(v.iter().filter(|&&a| a == val).count())
+                        Ok(<Option<$t>>::try_from_object(vm, obj)?.map_or(0, |val| {
+                            v.iter().filter(|&&a| a == val).count()
+                        }))
                     })*
                 }
             }
 
             fn remove(&mut self, obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<()>{
                 match self {
                     $(ArrayContentType::$n(v) => {
-                        let val = $t::try_from_object(vm, obj)?;
-                        if let Some(pos) = v.iter().position(|&a| a == val) {
-                            v.remove(pos);
-                        } else {
-                            return Err(vm.new_value_error("array.remove(x): x not in array".to_owned()));
+                        let pos = <Option<$t>>::try_from_object(vm, obj)?.map_or(None, |val| {
+                            v.iter().position(|&a| a == val)
+                        });
+
+                        match pos {
+                            Some(x) => {
+                                v.remove(x);
+                            },
+                            None => return Err(vm.new_value_error("array.remove(x): x not in array".to_owned()))
                         }
                     })*
                 }
@@ -147,8 +152,9 @@ macro_rules! def_array_enum {
             fn index(&self, x: PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<usize>> {
                 match self {
                     $(ArrayContentType::$n(v) => {
-                        let val = $t::try_from_object(vm, x)?;
-                        Ok(v.iter().position(|&a| a == val))
+                        Ok(<Option<$t>>::try_from_object(vm, x)?.map_or(None, |val| {
+                            v.iter().position(|&a| a == val)
+                        }))
                     })*
                 }
             }