From 4965cd403bc86984b724fd81f0e304d351a383e9 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 11 Oct 2021 04:14:52 +0100 Subject: [PATCH] add changelog --- actix-codec/CHANGES.md | 3 +++ actix-codec/src/lib.rs | 2 +- actix-codec/src/lines.rs | 16 ++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/actix-codec/CHANGES.md b/actix-codec/CHANGES.md index fd893454..736db50d 100644 --- a/actix-codec/CHANGES.md +++ b/actix-codec/CHANGES.md @@ -1,6 +1,9 @@ # Changes ## Unreleased - 2021-xx-xx +* Added `LinesCodec.` [#338] + +[#338]: https://github.com/actix/actix-net/pull/338 ## 0.4.0 - 2021-04-20 diff --git a/actix-codec/src/lib.rs b/actix-codec/src/lib.rs index 370c9bb7..5842fa7b 100644 --- a/actix-codec/src/lib.rs +++ b/actix-codec/src/lib.rs @@ -17,8 +17,8 @@ mod framed; mod lines; pub use self::bcodec::BytesCodec; -pub use self::lines::LinesCodec; pub use self::framed::{Framed, FramedParts}; +pub use self::lines::LinesCodec; pub use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; pub use tokio_util::codec::{Decoder, Encoder}; diff --git a/actix-codec/src/lines.rs b/actix-codec/src/lines.rs index 2d9cbd5a..387245ff 100644 --- a/actix-codec/src/lines.rs +++ b/actix-codec/src/lines.rs @@ -35,7 +35,7 @@ impl Decoder for LinesCodec { return Ok(None); } - let len = match memchr(b'\n', src.chunk()) { + let len = match memchr(b'\n', src) { Some(n) => n, None => { return Ok(None); @@ -128,13 +128,13 @@ mod tests { let mut buf = BytesMut::new(); codec.encode("", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"\n"); + assert_eq!(&buf[..], b"\n"); codec.encode("test", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"\ntest\n"); + assert_eq!(&buf[..], b"\ntest\n"); codec.encode("a\nb", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"\ntest\na\nb\n"); + assert_eq!(&buf[..], b"\ntest\na\nb\n"); } #[test] @@ -143,18 +143,18 @@ mod tests { let mut buf = BytesMut::new(); codec.encode("1234567", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"1234567\n"); + assert_eq!(&buf[..], b"1234567\n"); let mut buf = BytesMut::new(); codec.encode("12345678", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"12345678\n"); + assert_eq!(&buf[..], b"12345678\n"); let mut buf = BytesMut::new(); codec.encode("123456789111213", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"123456789111213\n"); + assert_eq!(&buf[..], b"123456789111213\n"); let mut buf = BytesMut::new(); codec.encode("1234567891112131", &mut buf).unwrap(); - assert_eq!(buf.chunk(), b"1234567891112131\n"); + assert_eq!(&buf[..], b"1234567891112131\n"); } }