Merge pull request #472 from epage/char

feat(stream): Allow finding chars in byte slices
winnow-rs · Feb 12, 2024 · 057288f · 057288f
2 parents c88418d + ed56b33
commit 057288f
Showing 1 changed file with 51 additions and 23 deletions.
diff --git a/src/stream/mod.rs b/src/stream/mod.rs
@@ -2489,6 +2489,48 @@ impl<'i, 's> FindSlice<(&'s [u8], &'s [u8], &'s [u8])> for &'i [u8] {
     }
 }
 
+impl<'i> FindSlice<char> for &'i [u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: char) -> Option<usize> {
+        let mut b = [0; 4];
+        let substr = substr.encode_utf8(&mut b);
+        self.find_slice(&*substr)
+    }
+}
+
+impl<'i> FindSlice<(char,)> for &'i [u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: (char,)) -> Option<usize> {
+        let mut b = [0; 4];
+        let substr0 = substr.0.encode_utf8(&mut b);
+        self.find_slice((&*substr0,))
+    }
+}
+
+impl<'i> FindSlice<(char, char)> for &'i [u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: (char, char)) -> Option<usize> {
+        let mut b = [0; 4];
+        let substr0 = substr.0.encode_utf8(&mut b);
+        let mut b = [0; 4];
+        let substr1 = substr.1.encode_utf8(&mut b);
+        self.find_slice((&*substr0, &*substr1))
+    }
+}
+
+impl<'i> FindSlice<(char, char, char)> for &'i [u8] {
+    #[inline(always)]
+    fn find_slice(&self, substr: (char, char, char)) -> Option<usize> {
+        let mut b = [0; 4];
+        let substr0 = substr.0.encode_utf8(&mut b);
+        let mut b = [0; 4];
+        let substr1 = substr.1.encode_utf8(&mut b);
+        let mut b = [0; 4];
+        let substr2 = substr.2.encode_utf8(&mut b);
+        self.find_slice((&*substr0, &*substr1, &*substr2))
+    }
+}
+
 impl<'i> FindSlice<u8> for &'i [u8] {
     #[inline(always)]
     fn find_slice(&self, substr: u8) -> Option<usize> {
@@ -2555,7 +2597,7 @@ impl<'i, 's> FindSlice<(&'s str, &'s str, &'s str)> for &'i [u8] {
 impl<'i, 's> FindSlice<&'s str> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: &'s str) -> Option<usize> {
-        self.as_bytes().find_slice(substr.as_bytes())
+        self.as_bytes().find_slice(substr)
     }
 }
 
@@ -2583,70 +2625,56 @@ impl<'i, 's> FindSlice<(&'s str, &'s str, &'s str)> for &'i str {
 impl<'i> FindSlice<char> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: char) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr = substr.encode_utf8(&mut b);
-        self.find_slice(&*substr)
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<(char,)> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: (char,)) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr0 = substr.0.encode_utf8(&mut b);
-        self.find_slice((&*substr0,))
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<(char, char)> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: (char, char)) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr0 = substr.0.encode_utf8(&mut b);
-        let mut b = [0; 4];
-        let substr1 = substr.1.encode_utf8(&mut b);
-        self.find_slice((&*substr0, &*substr1))
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<(char, char, char)> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: (char, char, char)) -> Option<usize> {
-        let mut b = [0; 4];
-        let substr0 = substr.0.encode_utf8(&mut b);
-        let mut b = [0; 4];
-        let substr1 = substr.1.encode_utf8(&mut b);
-        let mut b = [0; 4];
-        let substr2 = substr.2.encode_utf8(&mut b);
-        self.find_slice((&*substr0, &*substr1, &*substr2))
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<u8> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: u8) -> Option<usize> {
-        self.find_slice(substr.as_char())
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<(u8,)> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: (u8,)) -> Option<usize> {
-        self.find_slice((substr.0.as_char(),))
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<(u8, u8)> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: (u8, u8)) -> Option<usize> {
-        self.find_slice((substr.0.as_char(), substr.1.as_char()))
+        self.as_bytes().find_slice(substr)
     }
 }
 
 impl<'i> FindSlice<(u8, u8, u8)> for &'i str {
     #[inline(always)]
     fn find_slice(&self, substr: (u8, u8, u8)) -> Option<usize> {
-        self.find_slice((substr.0.as_char(), substr.1.as_char(), substr.2.as_char()))
+        self.as_bytes().find_slice(substr)
     }
 }