From 3be9a74a7fec2390ddfdb862ba891efb64d9cb7b Mon Sep 17 00:00:00 2001
From: Alex van de Sandt <me@alexvds.com>
Date: Wed, 6 May 2026 20:24:03 -0500
Subject: [PATCH] Use tokio_util's version of `bytes` crate

---
 Cargo.lock                              |  1 -
 Cargo.toml                              |  2 +-
 src/bytes_split.rs                      |  4 ++--
 src/codec.rs                            | 17 ++++++-----------
 src/command/bc125at/firmware_version.rs |  4 +++-
 src/command/macros.rs                   |  2 +-
 src/command/mod.rs                      |  2 +-
 src/command/ok_response.rs              |  4 +++-
 8 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5dce532..ab7a179 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,6 @@ version = 4
 name = "arctictis"
 version = "0.1.0"
 dependencies = [
- "bytes",
  "futures-util",
  "itoa",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index 9690f6a..6c30e85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-bytes = "1.11.0"
+# bytes = "1.11.0"
 futures-util = "0.3.31"
 itoa = "1.0.18"
 thiserror = "2.0.17"
diff --git a/src/bytes_split.rs b/src/bytes_split.rs
index d4e40b4..f4c84b7 100644
--- a/src/bytes_split.rs
+++ b/src/bytes_split.rs
@@ -1,4 +1,4 @@
-use bytes::{Buf, Bytes};
+use tokio_util::bytes::{Buf, Bytes};
 
 pub struct BytesSplit(Bytes, u8);
 
@@ -43,7 +43,7 @@ mod tests {
     #![allow(clippy::unwrap_used)]
 
     use super::*;
-    use bytes::Bytes;
+    use tokio_util::bytes::Bytes;
 
     #[test]
     fn splits_on_commas() {
diff --git a/src/codec.rs b/src/codec.rs
index aae97bb..723dc0a 100644
--- a/src/codec.rs
+++ b/src/codec.rs
@@ -1,5 +1,7 @@
-use bytes::{BufMut, Bytes};
-use tokio_util::codec::{AnyDelimiterCodec, AnyDelimiterCodecError, Decoder, Encoder};
+use tokio_util::{
+    bytes::{BufMut, Bytes, BytesMut},
+    codec::{AnyDelimiterCodec, AnyDelimiterCodecError, Decoder, Encoder},
+};
 
 use crate::{
     bytes_split::BytesSplit,
@@ -28,11 +30,7 @@ where
 {
     type Error = std::io::Error;
 
-    fn encode(
-        &mut self,
-        item: Cmd,
-        dst: &mut tokio_util::bytes::BytesMut,
-    ) -> Result<(), Self::Error> {
+    fn encode(&mut self, item: Cmd, dst: &mut BytesMut) -> Result<(), Self::Error> {
         let params = item.params();
         let est_len = Cmd::TEXT.len() + params.count() + params.total_size() + 1;
         dst.reserve(est_len);
@@ -96,10 +94,7 @@ impl Decoder for Codec {
     type Item = RawResponse;
     type Error = DecoderError;
 
-    fn decode(
-        &mut self,
-        src: &mut tokio_util::bytes::BytesMut,
-    ) -> Result<Option<Self::Item>, Self::Error> {
+    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
         let Some(output) = self.decoder.decode(src)? else {
             return Ok(None);
         };
diff --git a/src/command/bc125at/firmware_version.rs b/src/command/bc125at/firmware_version.rs
index 6612d5a..c2c1b2d 100644
--- a/src/command/bc125at/firmware_version.rs
+++ b/src/command/bc125at/firmware_version.rs
@@ -1,5 +1,7 @@
 use std::str::Utf8Error;
 
+use tokio_util::bytes::Bytes;
+
 use crate::command::{Response, command};
 
 #[derive(Debug, thiserror::Error)]
@@ -13,7 +15,7 @@ pub struct FirmwareVersion(pub String);
 
 impl Response for FirmwareVersion {
     type Error = FirmwareVersionError;
-    fn deserialize(raw_values: &[bytes::Bytes]) -> Result<Self, Self::Error> {
+    fn deserialize(raw_values: &[Bytes]) -> Result<Self, Self::Error> {
         let version = str::from_utf8(&raw_values[0])?.to_string();
         Ok(Self(version))
     }
diff --git a/src/command/macros.rs b/src/command/macros.rs
index 6507632..ab65b56 100644
--- a/src/command/macros.rs
+++ b/src/command/macros.rs
@@ -73,7 +73,7 @@ macro_rules! range_response {
             type Error = $error;
 
             fn deserialize(
-                raw_values: &[::bytes::Bytes],
+                raw_values: &[::tokio_util::bytes::Bytes],
             ) -> ::core::result::Result<Self, Self::Error> {
                 let level = ::core::str::from_utf8(&raw_values[0])?.parse()?;
                 Self::new(level).ok_or(Self::Error::$variant(level))
diff --git a/src/command/mod.rs b/src/command/mod.rs
index afb64dd..d3866b7 100644
--- a/src/command/mod.rs
+++ b/src/command/mod.rs
@@ -4,7 +4,7 @@ mod macros;
 mod no_params;
 mod ok_response;
 
-use bytes::{BufMut, Bytes, BytesMut};
+use tokio_util::bytes::{BufMut, Bytes, BytesMut};
 
 pub(crate) use macros::{command, range_param, range_response};
 pub(crate) use no_params::NoParams;
diff --git a/src/command/ok_response.rs b/src/command/ok_response.rs
index f41e7b7..df2b236 100644
--- a/src/command/ok_response.rs
+++ b/src/command/ok_response.rs
@@ -1,3 +1,5 @@
+use tokio_util::bytes::Bytes;
+
 use crate::command::Response;
 
 #[derive(Debug, thiserror::Error)]
@@ -14,7 +16,7 @@ pub struct OkResponse;
 impl Response for OkResponse {
     type Error = OkResponseError;
 
-    fn deserialize(raw_values: &[bytes::Bytes]) -> Result<Self, Self::Error> {
+    fn deserialize(raw_values: &[Bytes]) -> Result<Self, Self::Error> {
         if raw_values[0] != b"OK".as_ref() {
             return Err(OkResponseError::UnexpectedValue);
         }
-- 
2.51.2