sthagen
diff --git a/‎vm/src/obj/objbyteinner.rs‎
Lines changed: 4 additions & 0 deletions b/‎vm/src/obj/objbyteinner.rs‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎vm/src/obj/objstr.rs‎
Lines changed: 13 additions & 0 deletions b/‎vm/src/obj/objstr.rs‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎vm/src/obj/pystr.rs‎
Lines changed: 4 additions & 2 deletions b/‎vm/src/obj/pystr.rs‎
Lines changed: 4 additions & 2 deletions
@@ -1324,6 +1324,10 @@ impl PyCommonString<u8> for [u8] {
         &self[range]
     }
 
+    fn get_chars<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self {
+        &self[range]
+    }
+
     fn is_empty(&self) -> bool {
         Self::is_empty(self)
     }
 
@@ -1745,6 +1745,19 @@ impl PyCommonString<char> for str {
         &self[range]
     }
 
+    fn get_chars<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self {
+        let mut chars = self.chars();
+        for _ in 0..range.start {
+            let _ = chars.next();
+        }
+        let start = chars.as_str();
+        for _ in range {
+            let _ = chars.next();
+        }
+        let end = chars.as_str();
+        &start[..start.len() - end.len()]
+    }
+
     fn is_empty(&self) -> bool {
         Self::is_empty(self)
     }
 
@@ -118,6 +118,8 @@ pub trait PyCommonString<E> {
 
     fn with_capacity(capacity: usize) -> Self::Container;
     fn get_bytes<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self;
+    // FIXME: get_chars is expensive for str
+    fn get_chars<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self;
     fn bytes_len(&self) -> usize;
     fn chars_len(&self) -> usize;
     fn is_empty(&self) -> bool;
@@ -216,7 +218,7 @@ pub trait PyCommonString<E> {
     {
         if range.is_normal() {
             let start = range.start;
-            if let Some(index) = find(self.get_bytes(range), &needle) {
+            if let Some(index) = find(self.get_chars(range), &needle) {
                 return Some(start + index);
             }
         }
@@ -229,7 +231,7 @@ pub trait PyCommonString<E> {
         F: Fn(&Self, &Self) -> usize,
     {
         if range.is_normal() {
-            count(self.get_bytes(range), &needle)
+            count(self.get_chars(range), &needle)
         } else {
             0
         }
Original file line number	Diff line number	Diff line change
`@@ -1324,6 +1324,10 @@ impl PyCommonString<u8> for [u8] {`
`1324`	`1324`	`&self[range]`
`1325`	`1325`	`}`
`1326`	`1326`
	`1327`	`+ fn get_chars<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self {`
	`1328`	`+ &self[range]`
	`1329`	`+ }`
	`1330`	`+`
`1327`	`1331`	`fn is_empty(&self) -> bool {`
`1328`	`1332`	`Self::is_empty(self)`
`1329`	`1333`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ pub trait PyCommonString<E> {`
`118`	`118`
`119`	`119`	`fn with_capacity(capacity: usize) -> Self::Container;`
`120`	`120`	`fn get_bytes<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self;`
	`121`	`+ // FIXME: get_chars is expensive for str`
	`122`	`+ fn get_chars<'a>(&'a self, range: std::ops::Range<usize>) -> &'a Self;`
`121`	`123`	`fn bytes_len(&self) -> usize;`
`122`	`124`	`fn chars_len(&self) -> usize;`
`123`	`125`	`fn is_empty(&self) -> bool;`
`@@ -216,7 +218,7 @@ pub trait PyCommonString<E> {`
`216`	`218`	`{`
`217`	`219`	`if range.is_normal() {`
`218`	`220`	`let start = range.start;`
`219`		`- if let Some(index) = find(self.get_bytes(range), &needle) {`
	`221`	`+ if let Some(index) = find(self.get_chars(range), &needle) {`
`220`	`222`	`return Some(start + index);`
`221`	`223`	`}`
`222`	`224`	`}`
`@@ -229,7 +231,7 @@ pub trait PyCommonString<E> {`
`229`	`231`	`F: Fn(&Self, &Self) -> usize,`
`230`	`232`	`{`
`231`	`233`	`if range.is_normal() {`
`232`		`- count(self.get_bytes(range), &needle)`
	`234`	`+ count(self.get_chars(range), &needle)`
`233`	`235`	`} else {`
`234`	`236`	`0`
`235`	`237`	`}`