RustPython
diff --git a/‎Cargo.lock
Copy file name to clipboardExpand all lines: Cargo.lock
+1Lines changed: 1 addition & 0 deletions b/‎Cargo.lock
Copy file name to clipboardExpand all lines: Cargo.lock
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎common/Cargo.toml
Copy file name to clipboardExpand all lines: common/Cargo.toml
+1Lines changed: 1 addition & 0 deletions b/‎common/Cargo.toml
Copy file name to clipboardExpand all lines: common/Cargo.toml
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎common/src/wtf8/mod.rs
Copy file name to clipboardExpand all lines: common/src/wtf8/mod.rs
+20-34Lines changed: 20 additions & 34 deletions b/‎common/src/wtf8/mod.rs
Copy file name to clipboardExpand all lines: common/src/wtf8/mod.rs
+20-34Lines changed: 20 additions & 34 deletions
@@ -16,6 +16,7 @@ rustpython-format = { workspace = true }
 
 ascii = { workspace = true }
 bitflags = { workspace = true }
+bstr = { workspace = true }
 cfg-if = { workspace = true }
 itertools = { workspace = true }
 libc = { workspace = true }
 
@@ -49,6 +49,8 @@ use std::collections::TryReserveError;
 use std::string::String;
 use std::vec::Vec;
 
+use bstr::ByteSlice;
+
 mod core_char;
 mod core_str;
 
@@ -864,49 +866,27 @@ impl Wtf8 {
     }
 
     pub fn split(&self, pat: &Wtf8) -> impl Iterator<Item = &Self> {
-        self.splitn(usize::MAX, pat)
+        self.as_bytes()
+            .split_str(pat)
+            .map(|w| unsafe { Wtf8::from_bytes_unchecked(w) })
     }
 
     pub fn splitn(&self, n: usize, pat: &Wtf8) -> impl Iterator<Item = &Self> {
-        let (haystack, needle) = (self.as_bytes(), pat.as_bytes());
-        if n == 0 {
-            return None.into_iter().flatten();
-        }
-        let mut prev_idx = Some(0);
-        let mut iter = memchr::memmem::find_iter(haystack, needle).take(n - 1);
-        Some(std::iter::from_fn(move || {
-            prev_idx.map(|prev| {
-                let idx = iter.next();
-                let chunk = &haystack[prev..idx.unwrap_or(haystack.len())];
-                prev_idx = idx.map(|i| i + needle.len());
-                unsafe { Wtf8::from_bytes_unchecked(chunk) }
-            })
-        }))
-        .into_iter()
-        .flatten()
+        self.as_bytes()
+            .splitn_str(n, pat)
+            .map(|w| unsafe { Wtf8::from_bytes_unchecked(w) })
     }
 
     pub fn rsplit(&self, pat: &Wtf8) -> impl Iterator<Item = &Self> {
-        self.rsplitn(usize::MAX, pat)
+        self.as_bytes()
+            .rsplit_str(pat)
+            .map(|w| unsafe { Wtf8::from_bytes_unchecked(w) })
     }
 
     pub fn rsplitn(&self, n: usize, pat: &Wtf8) -> impl Iterator<Item = &Self> {
-        let (haystack, needle) = (self.as_bytes(), pat.as_bytes());
-        if n == 0 {
-            return None.into_iter().flatten();
-        }
-        let mut prev_idx = Some(haystack.len());
-        let mut iter = memchr::memmem::rfind_iter(haystack, needle).take(n - 1);
-        Some(std::iter::from_fn(move || {
-            prev_idx.map(|prev| {
-                let idx = iter.next();
-                let chunk = &haystack[idx.map_or(0, |i| i + needle.len())..prev];
-                prev_idx = idx;
-                unsafe { Wtf8::from_bytes_unchecked(chunk) }
-            })
-        }))
-        .into_iter()
-        .flatten()
+        self.as_bytes()
+            .rsplitn_str(n, pat)
+            .map(|w| unsafe { Wtf8::from_bytes_unchecked(w) })
     }
 
     pub fn trim_start_matches(&self, f: impl Fn(CodePoint) -> bool) -> &Self {
@@ -980,6 +960,12 @@ impl AsRef<Wtf8> for str {
     }
 }
 
+impl AsRef<[u8]> for Wtf8 {
+    fn as_ref(&self) -> &[u8] {
+        self.as_bytes()
+    }
+}
+
 /// Returns a slice of the given string for the byte range \[`begin`..`end`).
 ///
 /// # Panics