Wrap range with its meaning

Author: moreal

vm/src/anystr.rs

@@ -8,6 +8,19 @@ use crate::{
 use num_traits::{cast::ToPrimitive, sign::Signed};
 use std::str::FromStr;
 
+pub enum AnyStrRange {
+    CharsRange(std::ops::Range<usize>),
+    BytesRange(std::ops::Range<usize>),
+}
+
+impl AnyStrRange {
+    pub fn is_normal(&self) -> bool {
+        match self {
+            AnyStrRange::CharsRange(range) | AnyStrRange::BytesRange(range) => range.is_normal(),
+        }
+    }
+}
+
 #[derive(FromArgs)]
 pub struct SplitArgs<'s, T: TryFromObject + AnyStrWrapper<'s>> {
     #[pyarg(any, default)]
@@ -195,11 +208,10 @@ pub trait AnyStr<'s>: 's {
         F: Fn(&Self) -> PyObjectRef;
 
     #[inline]
-    fn py_startsendswith<T, F, FS>(
+    fn py_startsendswith<T, F>(
         &self,
         affix: PyObjectRef,
-        range: std::ops::Range<usize>,
-        slicer: FS,
+        range: AnyStrRange,
         func_name: &str,
         py_type_name: &str,
         func: F,
@@ -208,12 +220,14 @@ 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 = slicer(self, range);
+        let value = match range {
+            AnyStrRange::BytesRange(range) => self.get_bytes(range),
+            AnyStrRange::CharsRange(range) => self.get_chars(range),
+        };
 
         single_or_tuple_any(
             affix,

vm/src/builtins/bytearray.rs

@@ -438,8 +438,7 @@ impl PyByteArray {
         let (affix, range) = options.get_value(self.len());
         self.borrow_buf().py_startsendswith(
             affix,
-            range,
-            AnyStr::get_bytes,
+            anystr::AnyStrRange::BytesRange(range),
             "endswith",
             "bytes",
             |s, x: &PyBytesInner| s.ends_with(&x.elements[..]),
@@ -456,8 +455,7 @@ impl PyByteArray {
         let (affix, range) = options.get_value(self.len());
         self.borrow_buf().py_startsendswith(
             affix,
-            range,
-            AnyStr::get_bytes,
+            anystr::AnyStrRange::BytesRange(range),
             "startswith",
             "bytes",
             |s, x: &PyBytesInner| s.starts_with(&x.elements[..]),

vm/src/builtins/bytes.rs

@@ -278,8 +278,7 @@ impl PyBytes {
         let (affix, range) = options.get_value(self.len());
         self.inner.elements[..].py_startsendswith(
             affix,
-            range,
-            AnyStr::get_bytes,
+            anystr::AnyStrRange::BytesRange(range),
             "endswith",
             "bytes",
             |s, x: &PyBytesInner| s.ends_with(&x.elements[..]),
@@ -296,8 +295,7 @@ impl PyBytes {
         let (affix, range) = options.get_value(self.len());
         self.inner.elements[..].py_startsendswith(
             affix,
-            range,
-            AnyStr::get_bytes,
+            anystr::AnyStrRange::BytesRange(range),
             "startswith",
             "bytes",
             |s, x: &PyBytesInner| s.starts_with(&x.elements[..]),

vm/src/builtins/pystr.rs

@@ -4,7 +4,7 @@ use super::{
     PositionIterInternal, PyBytesRef, PyDict, PyTupleRef, PyTypeRef,
 };
 use crate::{
-    anystr::{self, adjust_indices, AnyStr, AnyStrContainer, AnyStrWrapper},
+    anystr::{self, adjust_indices, AnyStr, AnyStrContainer, AnyStrRange, AnyStrWrapper},
     format::{FormatSpec, FormatString, FromTemplate},
     function::{ArgIterable, FuncArgs, IntoPyException, IntoPyObject, OptionalArg, OptionalOption},
     protocol::PyIterReturn,
@@ -715,11 +715,10 @@ impl PyStr {
         let (affix, range) = args.get_value(len);
         self.as_str().py_startsendswith(
             affix,
-            range,
             if has_subrange {
-                str::get_chars
+                AnyStrRange::CharsRange(range)
             } else {
-                str::get_bytes
+                AnyStrRange::BytesRange(range)
             },
             "endswith",
             "str",
@@ -739,11 +738,10 @@ impl PyStr {
         let (affix, range) = args.get_value(len);
         self.as_str().py_startsendswith(
             affix,
-            range,
             if has_subrange {
-                str::get_chars
+                AnyStrRange::CharsRange(range)
             } else {
-                str::get_bytes
+                AnyStrRange::BytesRange(range)
             },
             "startswith",
             "str",