replace memchr with bytecount

src/uu/head/Cargo.toml

@@ -19,7 +19,9 @@ path = "src/head.rs"
 doctest = false
 
 [dependencies]
+bytecount = { workspace = true }
 clap = { workspace = true }
+fluent = { workspace = true }
 memchr = { workspace = true }
 thiserror = { workspace = true }
 uucore = { workspace = true, features = [
@@ -28,7 +30,6 @@ uucore = { workspace = true, features = [
   "lines",
   "fs",
 ] }
-fluent = { workspace = true }
 
 [[bin]]
 name = "head"

src/uu/head/src/take.rs

@@ -166,7 +166,7 @@ impl TakeAllLinesBuffer {
         self.partial_line = false;
         let bytes_read = self.inner.fill_buffer(reader)?;
         // Count the number of lines...
-        self.terminated_lines = memchr_iter(separator, self.inner.remaining_buffer()).count();
+        self.terminated_lines = bytecount::count(self.inner.remaining_buffer(), separator);
         if let Some(last_char) = self.inner.remaining_buffer().last() {
             if *last_char != separator {
                 self.partial_line = true;

src/uu/sort/Cargo.toml

@@ -27,8 +27,11 @@ i18n-collator = ["uucore/i18n-collator"]
 [dependencies]
 bigdecimal = { workspace = true }
 binary-heap-plus = { workspace = true }
+bytecount = { workspace = true }
 clap = { workspace = true }
 compare = { workspace = true }
+fluent = { workspace = true }
+foldhash = { workspace = true }
 itertools = { workspace = true }
 memchr = { workspace = true }
 rand = { workspace = true }
@@ -44,8 +47,6 @@ uucore = { workspace = true, features = [
   "i18n-collator",
   "i18n-datetime",
 ] }
-fluent = { workspace = true }
-foldhash = { workspace = true }
 
 [target.'cfg(not(any(target_os = "redox", target_os = "wasi")))'.dependencies]
 ctrlc = { workspace = true }

src/uu/sort/src/chunks.rs

@@ -286,7 +286,7 @@ fn parse_lines<'a>(
         let count = if read.is_empty() {
             1
         } else {
-            memchr_iter(separator, read).count() + 1
+            bytecount::count(read, separator) + 1
         };
         exact_line_count = Some(count);
         estimated = count;

src/uu/tail/Cargo.toml

@@ -20,11 +20,12 @@ path = "src/tail.rs"
 doctest = false
 
 [dependencies]
+bytecount = { workspace = true }
 clap = { workspace = true }
+fluent = { workspace = true }
 memchr = { workspace = true }
-uucore = { workspace = true, features = ["fs", "parser-size", "signals"] }
 same-file = { workspace = true }
-fluent = { workspace = true }
+uucore = { workspace = true, features = ["fs", "parser-size", "signals"] }
 
 [target.'cfg(not(target_os = "wasi"))'.dependencies]
 libc = { workspace = true }

src/uu/tail/src/chunks.rs

@@ -371,7 +371,7 @@ impl LinesChunk {
     /// assert_eq!(2, chunk.count_lines());
     /// ```
     fn count_lines(&self) -> usize {
-        memchr::memchr_iter(self.delimiter, self.get_buffer()).count()
+        bytecount::count(self.get_buffer(), self.delimiter)
     }
 
     /// Creates a new [`LinesChunk`] from an existing one with an offset in lines. The new chunk