Pass calculated range instead args

Author: moreal

vm/src/anystr.rs

@@ -61,13 +61,13 @@ pub struct StartsEndsWithArgs {
 }
 
 impl StartsEndsWithArgs {
-    fn get_value(self, len: usize) -> (PyObjectRef, std::ops::Range<usize>) {
+    pub fn get_value(self, len: usize) -> (PyObjectRef, std::ops::Range<usize>) {
         let range = adjust_indices(self.start, self.end, len);
         (self.affix, range)
     }
 
     pub fn has_subrange(&self) -> bool {
-        self.start.is_none() && self.end.is_none()
+        self.start.is_some() || self.end.is_some()
     }
 }
 
@@ -197,8 +197,8 @@ pub trait AnyStr<'s>: 's {
     #[inline]
     fn py_startsendswith<T, F>(
         &self,
-        args: StartsEndsWithArgs,
-        len: usize,
+        affix: PyObjectRef,
+        range: std::ops::Range<usize>,
         func_name: &str,
         py_type_name: &str,
         func: F,
@@ -208,17 +208,10 @@ pub trait AnyStr<'s>: 's {
         T: TryFromObject,
         F: Fn(&Self, &T) -> bool,
     {
-        let (affix, value) = if args.has_subrange() {
-            // If it doesn't have subrange, it uses bytes operation.
-            (args.affix, self.get_bytes(0..len))
-        } else {
-            let (affix, range) = args.get_value(len);
-            if !range.is_normal() {
-                return Ok(false);
-            }
-
-            (affix, self.get_chars(range))
-        };
+        if !range.is_normal() {
+            return Ok(false);
+        }
+        let value = self.get_chars(range);
 
         single_or_tuple_any(
             affix,

vm/src/builtins/bytearray.rs

@@ -435,9 +435,10 @@ impl PyByteArray {
 
     #[pymethod]
     fn endswith(&self, options: anystr::StartsEndsWithArgs, vm: &VirtualMachine) -> PyResult<bool> {
+        let (affix, range) = options.get_value(self.len());
         self.borrow_buf().py_startsendswith(
-            options,
-            self.len(),
+            affix,
+            range,
             "endswith",
             "bytes",
             |s, x: &PyBytesInner| s.ends_with(&x.elements[..]),
@@ -451,9 +452,10 @@ impl PyByteArray {
         options: anystr::StartsEndsWithArgs,
         vm: &VirtualMachine,
     ) -> PyResult<bool> {
+        let (affix, range) = options.get_value(self.len());
         self.borrow_buf().py_startsendswith(
-            options,
-            self.len(),
+            affix,
+            range,
             "startswith",
             "bytes",
             |s, x: &PyBytesInner| s.starts_with(&x.elements[..]),

vm/src/builtins/bytes.rs

@@ -275,9 +275,10 @@ impl PyBytes {
 
     #[pymethod]
     fn endswith(&self, options: anystr::StartsEndsWithArgs, vm: &VirtualMachine) -> PyResult<bool> {
+        let (affix, range) = options.get_value(self.len());
         self.inner.elements[..].py_startsendswith(
-            options,
-            self.len(),
+            affix,
+            range,
             "endswith",
             "bytes",
             |s, x: &PyBytesInner| s.ends_with(&x.elements[..]),
@@ -291,9 +292,11 @@ impl PyBytes {
         options: anystr::StartsEndsWithArgs,
         vm: &VirtualMachine,
     ) -> PyResult<bool> {
+        let (affix, range) = options.get_value(self.len());
+
         self.inner.elements[..].py_startsendswith(
-            options,
-            self.len(),
+            affix,
+            range,
             "startswith",
             "bytes",
             |s, x: &PyBytesInner| s.starts_with(&x.elements[..]),

vm/src/builtins/pystr.rs

@@ -707,14 +707,14 @@ impl PyStr {
     #[pymethod]
     fn endswith(&self, args: anystr::StartsEndsWithArgs, vm: &VirtualMachine) -> PyResult<bool> {
         let len = if args.has_subrange() {
-            self.byte_len()
-        } else {
             self.char_len()
+        } else {
+            self.byte_len()
         };
-
+        let (affix, range) = args.get_value(len);
         self.as_str().py_startsendswith(
-            args,
-            len,
+            affix,
+            range,
             "endswith",
             "str",
             |s, x: &PyStrRef| s.ends_with(x.as_str()),
@@ -725,14 +725,14 @@ impl PyStr {
     #[pymethod]
     fn startswith(&self, args: anystr::StartsEndsWithArgs, vm: &VirtualMachine) -> PyResult<bool> {
         let len = if args.has_subrange() {
-            self.byte_len()
-        } else {
             self.char_len()
+        } else {
+            self.byte_len()
         };
-
+        let (affix, range) = args.get_value(len);
         self.as_str().py_startsendswith(
-            args,
-            len,
+            affix,
+            range,
             "startswith",
             "str",
             |s, x: &PyStrRef| s.starts_with(x.as_str()),