Skip to content

Commit

Permalink
implicitly grow BytesMut; add BufMutExt::chain_mut
Browse files Browse the repository at this point in the history
This brings `BytesMut` in line with `Vec<u8>` behavior.

In order to fix a test, `BufMutExt::chain_mut` is provided. Withou this,
it is not possible to chain two `&mut [u8]`.

Closes #170
  • Loading branch information
carllerche committed Nov 20, 2019
1 parent 9a10add commit e93b867
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 12 deletions.
26 changes: 26 additions & 0 deletions src/buf/ext/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,32 @@ pub trait BufMutExt: BufMut {
fn writer(self) -> Writer<Self> where Self: Sized {
writer::new(self)
}

/// Creates an adaptor which will chain this buffer with another.
///
/// The returned `BufMut` instance will first write to all bytes from
/// `self`. Afterwards, it will write to `next`.
///
/// # Examples
///
/// ```
/// use bytes::{BufMut, buf::BufMutExt};
///
/// let mut a = [0u8; 5];
/// let mut b = [0u8; 6];
///
/// let mut chain = (&mut a[..]).chain_mut(&mut b[..]);
///
/// chain.put_slice(b"hello world");
///
/// assert_eq!(&a[..], b"hello");
/// assert_eq!(&b[..], b" world");
/// ```
fn chain_mut<U: BufMut>(self, next: U) -> Chain<Self, U>
where Self: Sized
{
Chain::new(self, next)
}
}

impl<B: BufMut + ?Sized> BufMutExt for B {}
6 changes: 5 additions & 1 deletion src/bytes_mut.rs
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ impl Buf for BytesMut {
impl BufMut for BytesMut {
#[inline]
fn remaining_mut(&self) -> usize {
self.capacity() - self.len()
usize::MAX - self.len()
}

#[inline]
Expand All @@ -936,6 +936,10 @@ impl BufMut for BytesMut {

#[inline]
fn bytes_mut(&mut self) -> &mut [mem::MaybeUninit<u8>] {
if self.capacity() == self.len() {
self.reserve(64);
}

unsafe {
slice::from_raw_parts_mut(self.ptr.as_ptr().offset(self.len as isize) as *mut mem::MaybeUninit<u8>, self.cap)
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_buf_mut.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn test_bufs_vec_mut() {
// with no capacity
let mut buf = BytesMut::new();
assert_eq!(buf.capacity(), 0);
assert_eq!(0, buf.bytes_vectored_mut(&mut dst[..]));
assert_eq!(1, buf.bytes_vectored_mut(&mut dst[..]));

// with capacity
let mut buf = BytesMut::with_capacity(64);
Expand Down
4 changes: 2 additions & 2 deletions tests/test_bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ fn fmt_write() {


let mut c = BytesMut::with_capacity(64);
write!(c, "{}", s).unwrap_err();
assert!(c.is_empty());
write!(c, "{}", s).unwrap();
assert_eq!(c, s[..].as_bytes());
}

#[test]
Expand Down
13 changes: 5 additions & 8 deletions tests/test_chain.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![deny(warnings, rust_2018_idioms)]

use bytes::{Buf, BufMut, Bytes, BytesMut};
use bytes::buf::BufExt;
use bytes::{Buf, BufMut, Bytes};
use bytes::buf::{BufExt, BufMutExt};
use std::io::IoSlice;

#[test]
Expand All @@ -15,20 +15,17 @@ fn collect_two_bufs() {

#[test]
fn writing_chained() {
let mut a = BytesMut::with_capacity(64);
let mut b = BytesMut::with_capacity(64);
let mut a = [0u8; 64];
let mut b = [0u8; 64];

{
let mut buf = (&mut a).chain(&mut b);
let mut buf = (&mut a[..]).chain_mut(&mut b[..]);

for i in 0u8..128 {
buf.put_u8(i);
}
}

assert_eq!(64, a.len());
assert_eq!(64, b.len());

for i in 0..64 {
let expect = i as u8;
assert_eq!(expect, a[i]);
Expand Down

0 comments on commit e93b867

Please sign in to comment.