Replace twoway with memchr

The former is unmaintained so `cargo audit` shows a warning

Author: tailhook

Cargo.lock

@@ -11,7 +11,7 @@ base32 = "0.4.0"
 sha2 = "0.10.2"
 snafu = "0.7.0"
 combine = "4.5.2"
-twoway = "0.2.1"
+memchr = "2.5.0"
 wasm-bindgen = { version="0.2", features=["serde-serialize"], optional=true }
 serde = { version="1.0.106", features=["derive"], optional=true }
 thiserror = "1.0.23"

edb/edgeql-parser/Cargo.toml

@@ -1,4 +1,4 @@
-use twoway::find_bytes;
+use memchr::memmem::find;
 
 #[derive(Debug, PartialEq)]
 pub struct Continuation {
@@ -96,9 +96,8 @@ pub fn full_statement(data: &[u8], continuation: Option<Continuation>)
             b'$' => {
                 match iter.next() {
                     Some((end_idx, b'$')) => {
-                        if let Some(end) = find_bytes(&data[end_idx+1..],
-                                                      b"$$")
-                        {
+                        let end = find(&data[end_idx+1..], b"$$");
+                        if let Some(end) = end {
                             iter.nth(end + end_idx - idx);
                             continue 'outer;
                         }
@@ -131,8 +130,8 @@ pub fn full_statement(data: &[u8], continuation: Option<Continuation>)
                         b'$' => {
                             let end_idx = c_idx + 1;
                             let marker_size = end_idx - idx;
-                            if let Some(end) = find_bytes(&data[end_idx..],
-                                                          &data[idx..end_idx])
+                            if let Some(end) = find(&data[end_idx..],
+                                                    &data[idx..end_idx])
                             {
                                 iter.nth(1 + end + marker_size - 1);
                                 continue 'outer;

edb/edgeql-parser/src/preparser.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::borrow::Cow;
 
-use combine::{StreamOnce, Positioned};
+use combine::easy::{Error, Errors};
 use combine::error::{StreamError};
 use combine::stream::{ResetStream};
-use combine::easy::{Error, Errors};
-use twoway::find_str;
+use combine::{StreamOnce, Positioned};
+use memchr::memmem::find;
 
 use crate::position::Pos;
 
@@ -414,9 +414,9 @@ impl<'a> TokenStream<'a> {
                 if let Some((_, c)) = iter.next() {
                     match c {
                         '$' => {
-                            if let Some(end) = find_str(
-                                &self.buf[self.off+2..], "$$")
-                            {
+                            let suffix = &self.buf[self.off+2..];
+                            let end = find(suffix.as_bytes(), b"$$");
+                            if let Some(end) = end {
                                 for c in self.buf[self.off+2..][..end].chars() {
                                     check_prohibited(c, false)?;
                                 }
@@ -495,9 +495,9 @@ impl<'a> TokenStream<'a> {
                                 return Err(Error::unexpected_static_message(
                                     "dollar quote supports only ascii chars"));
                             }
-                            if let Some(end) = find_str(
-                                &self.buf[self.off+msize..],
-                                &marker)
+                            if let Some(end) = find(
+                                self.buf[self.off+msize..].as_bytes(),
+                                marker.as_bytes())
                             {
                                 let data = &self.buf[self.off+msize..][..end];
                                 for c in data.chars() {