remove vm.try_index

Author: youknowone

stdlib/src/bisect.rs

@@ -25,7 +25,7 @@ mod _bisect {
         vm: &VirtualMachine,
     ) -> PyResult<Option<isize>> {
         arg.into_option()
-            .map(|v| vm.to_index(&v)?.try_to_primitive(vm))
+            .map(|v| v.try_index(vm)?.try_to_primitive(vm))
             .transpose()
     }
 

stdlib/src/math.rs

@@ -199,7 +199,7 @@ mod math {
 
     #[pyfunction]
     fn isqrt(x: PyObjectRef, vm: &VirtualMachine) -> PyResult<BigInt> {
-        let index = vm.to_index(&x)?;
+        let index = x.try_index(vm)?;
         let value = index.as_bigint();
 
         if value.is_negative() {

stdlib/src/select.rs

@@ -347,7 +347,7 @@ mod decl {
                     Some(ms) => {
                         let ms = if let Some(float) = ms.payload::<PyFloat>() {
                             float.to_f64().to_i32()
-                        } else if let Some(int) = vm.to_index_opt(ms.clone()) {
+                        } else if let Some(int) = ms.try_index_opt(vm) {
                             int?.as_bigint().to_i32()
                         } else {
                             return Err(vm.new_type_error(format!(

stdlib/src/socket.rs

@@ -734,8 +734,8 @@ mod _socket {
         if obj.fast_isinstance(vm.ctx.types.float_type) {
             return Err(vm.new_type_error("integer argument expected, got float".to_owned()));
         }
-        let int = vm
-            .to_index_opt(obj)
+        let int = obj
+            .try_index_opt(vm)
             .unwrap_or_else(|| Err(vm.new_type_error("an integer is required".to_owned())))?;
         int.try_to_primitive::<CastFrom>(vm)
             .map(|sock| sock as RawSocket)
@@ -1382,7 +1382,7 @@ mod _socket {
             let (flags, address) = match arg3 {
                 OptionalArg::Present(arg3) => {
                     // should just be i32::try_from_obj but tests check for error message
-                    let int = vm.to_index_opt(arg2).unwrap_or_else(|| {
+                    let int = arg2.try_index_opt(vm).unwrap_or_else(|| {
                         Err(vm.new_type_error("an integer is required".to_owned()))
                     })?;
                     let flags = int.try_to_primitive::<i32>(vm)?;

vm/src/buffer.rs

@@ -491,15 +491,15 @@ fn get_int_or_index<T>(vm: &VirtualMachine, arg: PyObjectRef) -> PyResult<T>
 where
     T: PrimInt + for<'a> TryFrom<&'a BigInt>,
 {
-    match vm.to_index_opt(arg) {
-        Some(index) => index?
-            .try_to_primitive(vm)
-            .map_err(|_| new_struct_error(vm, "argument out of range".to_owned())),
-        None => Err(new_struct_error(
+    let index = arg.try_index_opt(vm).unwrap_or_else(|| {
+        Err(new_struct_error(
             vm,
             "required argument is not an integer".to_owned(),
-        )),
-    }
+        ))
+    })?;
+    index
+        .try_to_primitive(vm)
+        .map_err(|_| new_struct_error(vm, "argument out of range".to_owned()))
 }
 
 make_pack_primint!(i8);

vm/src/builtins/int.rs

@@ -69,7 +69,7 @@ impl PyPayload for PyInt {
     }
 
     fn special_retrieve(vm: &VirtualMachine, obj: &PyObject) -> Option<PyResult<PyRef<Self>>> {
-        Some(vm.to_index(obj))
+        Some(obj.try_index(vm))
     }
 }
 
@@ -245,8 +245,8 @@ impl Constructor for PyInt {
     fn py_new(cls: PyTypeRef, options: Self::Args, vm: &VirtualMachine) -> PyResult {
         let value = if let OptionalArg::Present(val) = options.val_options {
             if let OptionalArg::Present(base) = options.base {
-                let base = vm
-                    .to_index(&base)?
+                let base = base
+                    .try_index(vm)?
                     .as_bigint()
                     .to_u32()
                     .filter(|&v| v == 0 || (2..=36).contains(&v))

vm/src/builtins/memory.rs

@@ -904,7 +904,7 @@ impl TryFromObject for SubscriptNeedle {
             Ok(Self::Index(i.try_to_primitive(vm)?))
         } else if obj.payload_is::<PySlice>() {
             Ok(Self::Slice(unsafe { obj.downcast_unchecked::<PySlice>() }))
-        } else if let Ok(i) = vm.to_index(&obj) {
+        } else if let Ok(i) = obj.try_index(vm) {
             Ok(Self::Index(i.try_to_primitive(vm)?))
         } else {
             if let Some(tuple) = obj.payload::<PyTuple>() {

vm/src/builtins/range.rs

@@ -682,7 +682,7 @@ impl TryFromObject for RangeIndex {
             i @ PyInt => Ok(RangeIndex::Int(i)),
             s @ PySlice => Ok(RangeIndex::Slice(s)),
             obj => {
-                let val = vm.to_index(&obj).map_err(|_| vm.new_type_error(format!(
+                let val = obj.try_index(vm).map_err(|_| vm.new_type_error(format!(
                     "sequence indices be integers or slices or classes that override __index__ operator, not '{}'",
                     obj.class().name()
                 )))?;

vm/src/byte.rs

@@ -20,7 +20,7 @@ pub fn bytes_from_object(vm: &VirtualMachine, obj: &PyObject) -> PyResult<Vec<u8
 }
 
 pub fn value_from_object(vm: &VirtualMachine, obj: &PyObject) -> PyResult<u8> {
-    vm.to_index(obj)?
+    obj.try_index(vm)?
         .as_bigint()
         .to_u8()
         .ok_or_else(|| vm.new_value_error("byte must be in range(0, 256)".to_owned()))

vm/src/convert/try_from.rs

@@ -108,7 +108,7 @@ impl TryFromObject for std::time::Duration {
         use std::time::Duration;
         if let Some(float) = obj.payload::<PyFloat>() {
             Ok(Duration::from_secs_f64(float.to_f64()))
-        } else if let Some(int) = vm.to_index_opt(obj.clone()) {
+        } else if let Some(int) = obj.try_index_opt(vm) {
             let sec = int?
                 .as_bigint()
                 .to_u64()