Relocate vm.obj_len to obj.length

Author: ChJR

stdlib/src/bisect.rs

@@ -72,7 +72,7 @@ mod _bisect {
         BisectArgs { a, x, lo, hi }: BisectArgs,
         vm: &VirtualMachine,
     ) -> PyResult<usize> {
-        let (mut lo, mut hi) = as_usize(lo, hi, vm.obj_len(&a)?, vm)?;
+        let (mut lo, mut hi) = as_usize(lo, hi, a.length(vm)?, vm)?;
 
         while lo < hi {
             // Handles issue 13496.
@@ -100,7 +100,7 @@ mod _bisect {
         BisectArgs { a, x, lo, hi }: BisectArgs,
         vm: &VirtualMachine,
     ) -> PyResult<usize> {
-        let (mut lo, mut hi) = as_usize(lo, hi, vm.obj_len(&a)?, vm)?;
+        let (mut lo, mut hi) = as_usize(lo, hi, a.length(vm)?, vm)?;
 
         while lo < hi {
             // Handles issue 13496.

vm/src/builtins/enumerate.rs

@@ -88,7 +88,7 @@ impl PyReverseSequenceIterator {
     fn length_hint(&self, vm: &VirtualMachine) -> PyResult<usize> {
         let internal = self.internal.lock();
         if let IterStatus::Active(obj) = &internal.status {
-            if internal.position <= vm.obj_len(obj)? {
+            if internal.position <= obj.length(vm)? {
                 return Ok(internal.position + 1);
             }
         }

vm/src/builtins/iter.rs

@@ -181,7 +181,7 @@ impl PySequenceIterator {
     fn length_hint(&self, vm: &VirtualMachine) -> PyObjectRef {
         let internal = self.internal.lock();
         if let IterStatus::Active(obj) = &internal.status {
-            vm.obj_len(obj)
+            obj.length(vm)
                 .map(|x| PyInt::from(x).into_object(vm))
                 .unwrap_or_else(|_| vm.ctx.not_implemented())
         } else {

vm/src/stdlib/builtins.rs

@@ -424,7 +424,7 @@ mod builtins {
 
     #[pyfunction]
     fn len(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
-        vm.obj_len(&obj)
+        obj.length(vm)
     }
 
     #[pyfunction]
@@ -690,7 +690,7 @@ mod builtins {
             vm.get_method_or_type_error(obj.clone(), "__getitem__", || {
                 "argument to reversed() must be a sequence".to_owned()
             })?;
-            let len = vm.obj_len(&obj)?;
+            let len = obj.length(vm)?;
             let obj_iterator = PyReverseSequenceIterator::new(obj, len);
             Ok(obj_iterator.into_object(vm))
         }

vm/src/stdlib/io.rs

@@ -453,11 +453,11 @@ mod _io {
             }
             let hint = hint as usize;
             let mut ret = Vec::new();
-            let it = ArgIterable::try_from_object(vm, instance)?;
+            let it = ArgIterable::<PyObjectRef>::try_from_object(vm, instance)?;
             let mut full_len = 0;
             for line in it.iter(vm)? {
                 let line = line?;
-                let line_len = vm.obj_len(&line)?;
+                let line_len = line.length(vm)?;
                 ret.push(line.clone());
                 full_len += line_len;
                 if full_len > hint {