Pass slicer manually

Author: moreal

vm/src/anystr.rs

@@ -195,10 +195,11 @@ pub trait AnyStr<'s>: 's {
         F: Fn(&Self) -> PyObjectRef;
 
     #[inline]
-    fn py_startsendswith<T, F>(
+    fn py_startsendswith<T, F, FS>(
         &self,
         affix: PyObjectRef,
         range: std::ops::Range<usize>,
+        slicer: FS,
         func_name: &str,
         py_type_name: &str,
         func: F,
@@ -207,11 +208,12 @@ pub trait AnyStr<'s>: 's {
     where
         T: TryFromObject,
         F: Fn(&Self, &T) -> bool,
+        FS: Fn(&Self, std::ops::Range<usize>) -> &Self,
     {
         if !range.is_normal() {
             return Ok(false);
         }
-        let value = self.get_chars(range);
+        let value = slicer(&self, range);
 
         single_or_tuple_any(
             affix,

vm/src/builtins/bytearray.rs

@@ -439,6 +439,7 @@ impl PyByteArray {
         self.borrow_buf().py_startsendswith(
             affix,
             range,
+            AnyStr::get_bytes,
             "endswith",
             "bytes",
             |s, x: &PyBytesInner| s.ends_with(&x.elements[..]),
@@ -456,6 +457,7 @@ impl PyByteArray {
         self.borrow_buf().py_startsendswith(
             affix,
             range,
+            AnyStr::get_bytes,
             "startswith",
             "bytes",
             |s, x: &PyBytesInner| s.starts_with(&x.elements[..]),

vm/src/builtins/bytes.rs

@@ -279,6 +279,7 @@ impl PyBytes {
         self.inner.elements[..].py_startsendswith(
             affix,
             range,
+            AnyStr::get_bytes,
             "endswith",
             "bytes",
             |s, x: &PyBytesInner| s.ends_with(&x.elements[..]),
@@ -293,10 +294,10 @@ impl PyBytes {
         vm: &VirtualMachine,
     ) -> PyResult<bool> {
         let (affix, range) = options.get_value(self.len());
-
         self.inner.elements[..].py_startsendswith(
             affix,
             range,
+            AnyStr::get_bytes,
             "startswith",
             "bytes",
             |s, x: &PyBytesInner| s.starts_with(&x.elements[..]),

vm/src/builtins/pystr.rs

@@ -706,6 +706,7 @@ impl PyStr {
 
     #[pymethod]
     fn endswith(&self, args: anystr::StartsEndsWithArgs, vm: &VirtualMachine) -> PyResult<bool> {
+        let has_subrange = args.has_subrange();
         let len = if args.has_subrange() {
             self.char_len()
         } else {
@@ -715,6 +716,11 @@ impl PyStr {
         self.as_str().py_startsendswith(
             affix,
             range,
+            if has_subrange {
+                str::get_chars
+            } else {
+                str::get_bytes
+            },
             "endswith",
             "str",
             |s, x: &PyStrRef| s.ends_with(x.as_str()),
@@ -724,7 +730,8 @@ impl PyStr {
 
     #[pymethod]
     fn startswith(&self, args: anystr::StartsEndsWithArgs, vm: &VirtualMachine) -> PyResult<bool> {
-        let len = if args.has_subrange() {
+        let has_subrange = args.has_subrange();
+        let len = if has_subrange {
             self.char_len()
         } else {
             self.byte_len()
@@ -733,6 +740,11 @@ impl PyStr {
         self.as_str().py_startsendswith(
             affix,
             range,
+            if has_subrange {
+                str::get_chars
+            } else {
+                str::get_bytes
+            },
             "startswith",
             "str",
             |s, x: &PyStrRef| s.starts_with(x.as_str()),