mirror of
https://github.com/tokio-rs/bytes.git
synced 2026-08-18 00:00:12 +02:00
Freshen up buf API
This commit is contained in:
+24
-34
@@ -1,18 +1,17 @@
|
||||
use bytes::RingBuf;
|
||||
|
||||
use bytes::{RingBuf, Buf, MutBuf};
|
||||
|
||||
#[test]
|
||||
pub fn test_initial_buf_empty() {
|
||||
use bytes::traits::{Buf, BufExt, MutBuf, MutBufExt};
|
||||
use bytes::traits::{Buf, MutBuf};
|
||||
|
||||
let mut buf = RingBuf::new(16);
|
||||
assert_eq!(MutBuf::remaining(&buf), 16);
|
||||
assert_eq!(Buf::remaining(&buf), 0);
|
||||
|
||||
let bytes_written = buf.write(&[1, 2, 3][..]).unwrap();
|
||||
let bytes_written = buf.copy_from(&[1, 2, 3][..]).unwrap();
|
||||
assert_eq!(bytes_written, 3);
|
||||
|
||||
let bytes_written = buf.write(&[][..]).unwrap();
|
||||
let bytes_written = buf.copy_from(&[][..]).unwrap();
|
||||
assert_eq!(bytes_written, 0);
|
||||
assert_eq!(MutBuf::remaining(&buf), 13);
|
||||
assert_eq!(Buf::remaining(&buf), 3);
|
||||
@@ -21,11 +20,11 @@ pub fn test_initial_buf_empty() {
|
||||
let mut out = [0u8; 3];
|
||||
|
||||
buf.mark();
|
||||
let bytes_read = buf.read(&mut out[..]).unwrap();;
|
||||
let bytes_read = buf.copy_to(&mut out[..]).unwrap();;
|
||||
assert_eq!(bytes_read, 3);
|
||||
assert_eq!(out, [1, 2, 3]);
|
||||
buf.reset();
|
||||
let bytes_read = buf.read(&mut out[..]).unwrap();;
|
||||
let bytes_read = buf.copy_to(&mut out[..]).unwrap();;
|
||||
assert_eq!(bytes_read, 3);
|
||||
assert_eq!(out, [1, 2, 3]);
|
||||
|
||||
@@ -35,44 +34,41 @@ pub fn test_initial_buf_empty() {
|
||||
|
||||
#[test]
|
||||
fn test_wrapping_write() {
|
||||
use bytes::traits::{BufExt, MutBufExt};
|
||||
let mut buf = RingBuf::new(16);
|
||||
let mut out = [0;10];
|
||||
|
||||
buf.write(&[42;12][..]).unwrap();
|
||||
let bytes_read = buf.read(&mut out[..]).unwrap();
|
||||
buf.copy_from(&[42;12][..]).unwrap();
|
||||
let bytes_read = buf.copy_to(&mut out[..]).unwrap();
|
||||
assert_eq!(bytes_read, 10);
|
||||
|
||||
let bytes_written = buf.write(&[23;8][..]).unwrap();
|
||||
let bytes_written = buf.copy_from(&[23;8][..]).unwrap();
|
||||
assert_eq!(bytes_written, 8);
|
||||
|
||||
buf.mark();
|
||||
let bytes_read = buf.read(&mut out[..]).unwrap();
|
||||
let bytes_read = buf.copy_to(&mut out[..]).unwrap();
|
||||
assert_eq!(bytes_read, 10);
|
||||
assert_eq!(out, [42, 42, 23, 23, 23, 23, 23, 23, 23, 23]);
|
||||
buf.reset();
|
||||
let bytes_read = buf.read(&mut out[..]).unwrap();
|
||||
let bytes_read = buf.copy_to(&mut out[..]).unwrap();
|
||||
assert_eq!(bytes_read, 10);
|
||||
assert_eq!(out, [42, 42, 23, 23, 23, 23, 23, 23, 23, 23]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_io_write_and_read() {
|
||||
use std::io::{Read, Write};
|
||||
|
||||
let mut buf = RingBuf::new(16);
|
||||
let mut out = [0;8];
|
||||
let mut out = [0u8;8];
|
||||
|
||||
let written = buf.write(&[1;8][..]).unwrap();
|
||||
let written = buf.copy_from(&[1;8][..]).unwrap();
|
||||
assert_eq!(written, 8);
|
||||
|
||||
buf.read(&mut out).unwrap();
|
||||
buf.copy_to(&mut out[..]).unwrap();
|
||||
assert_eq!(out, [1;8]);
|
||||
|
||||
let written = buf.write(&[2;8][..]).unwrap();
|
||||
let written = buf.copy_from(&[2;8][..]).unwrap();
|
||||
assert_eq!(written, 8);
|
||||
|
||||
let bytes_read = buf.read(&mut out).unwrap();
|
||||
let bytes_read = buf.copy_to(&mut out[..]).unwrap();
|
||||
assert_eq!(bytes_read, 8);
|
||||
assert_eq!(out, [2;8]);
|
||||
}
|
||||
@@ -80,29 +76,25 @@ fn test_io_write_and_read() {
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn test_wrap_reset() {
|
||||
use std::io::{Read, Write};
|
||||
|
||||
let mut buf = RingBuf::new(8);
|
||||
buf.write(&[1, 2, 3, 4, 5, 6, 7]).unwrap();
|
||||
buf.copy_from(&[1, 2, 3, 4, 5, 6, 7][..]).unwrap();
|
||||
buf.mark();
|
||||
buf.read(&mut [0; 4]).unwrap();
|
||||
buf.write(&[1, 2, 3, 4]).unwrap();
|
||||
buf.copy_to(&mut [0; 4][..]).unwrap();
|
||||
buf.copy_from(&[1, 2, 3, 4][..]).unwrap();
|
||||
buf.reset();
|
||||
}
|
||||
|
||||
#[test]
|
||||
// Test that writes across a mark/reset are preserved.
|
||||
fn test_mark_write() {
|
||||
use std::io::{Read, Write};
|
||||
|
||||
let mut buf = RingBuf::new(8);
|
||||
buf.write(&[1, 2, 3, 4, 5, 6, 7]).unwrap();
|
||||
buf.copy_from(&[1, 2, 3, 4, 5, 6, 7][..]).unwrap();
|
||||
buf.mark();
|
||||
buf.write(&[8]).unwrap();
|
||||
buf.copy_from(&[8][..]).unwrap();
|
||||
buf.reset();
|
||||
|
||||
let mut buf2 = [0; 8];
|
||||
buf.read(&mut buf2).unwrap();
|
||||
buf.copy_to(&mut buf2[..]).unwrap();
|
||||
assert_eq!(buf2, [1, 2, 3, 4, 5, 6, 7, 8]);
|
||||
}
|
||||
|
||||
@@ -111,10 +103,9 @@ fn test_mark_write() {
|
||||
// full buffer to zero.
|
||||
fn test_reset_full() {
|
||||
use bytes::traits::MutBuf;
|
||||
use std::io::Write;
|
||||
|
||||
let mut buf = RingBuf::new(8);
|
||||
buf.write(&[1, 2, 3, 4, 5, 6, 7, 8]).unwrap();
|
||||
buf.copy_from(&[1, 2, 3, 4, 5, 6, 7, 8][..]).unwrap();
|
||||
assert_eq!(MutBuf::remaining(&buf), 0);
|
||||
buf.mark();
|
||||
buf.reset();
|
||||
@@ -126,10 +117,9 @@ fn test_reset_full() {
|
||||
// Test that "RingBuf::clear" does the full reset
|
||||
fn test_clear() {
|
||||
use bytes::traits::{Buf, MutBuf};
|
||||
use std::io::Write;
|
||||
|
||||
let mut buf = RingBuf::new(8);
|
||||
buf.write(&[0; 8]).unwrap();
|
||||
buf.copy_from(&[0; 8][..]).unwrap();
|
||||
assert_eq!(MutBuf::remaining(&buf), 0);
|
||||
assert_eq!(Buf::remaining(&buf), 8);
|
||||
buf.clear();
|
||||
|
||||
Reference in New Issue
Block a user