Skip to content

Commit

Permalink
Remove Buf impl for &str (#301)
Browse files Browse the repository at this point in the history
A `&str` cannot arbitrarily advance bytes, since it will panic if
advanced to the middle of a Unicode segment.
  • Loading branch information
seanmonstar authored and carllerche committed Oct 16, 2019
1 parent 43ac8e5 commit 491ebbf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 26 deletions.
21 changes: 2 additions & 19 deletions src/buf/buf_impl.rs
Expand Up @@ -903,9 +903,9 @@ pub trait Buf {
/// # Examples
///
/// ```
/// use bytes::{Buf};
/// use bytes::Buf;
///
/// let bytes = "hello world".to_bytes();
/// let bytes = (&b"hello world"[..]).to_bytes();
/// assert_eq!(&bytes[..], &b"hello world"[..]);
/// ```
fn to_bytes(&mut self) -> crate::Bytes {
Expand Down Expand Up @@ -971,23 +971,6 @@ impl Buf for &[u8] {
}
}

impl Buf for &str {
#[inline]
fn remaining(&self) -> usize {
self.len()
}

#[inline]
fn bytes(&self) -> &[u8] {
self.as_bytes()
}

#[inline]
fn advance(&mut self, cnt: usize) {
*self = &self[cnt..];
}
}

impl Buf for Option<[u8; 1]> {
fn remaining(&self) -> usize {
if self.is_some() {
Expand Down
8 changes: 4 additions & 4 deletions src/buf/buf_mut.rs
Expand Up @@ -24,7 +24,7 @@ use alloc::{vec::Vec, boxed::Box};
///
/// let mut buf = vec![];
///
/// buf.put("hello world");
/// buf.put(&b"hello world"[..]);
///
/// assert_eq!(buf, b"hello world");
/// ```
Expand All @@ -44,7 +44,7 @@ pub trait BufMut {
/// let mut buf = &mut dst[..];
///
/// let original_remaining = buf.remaining_mut();
/// buf.put("hello");
/// buf.put(&b"hello"[..]);
///
/// assert_eq!(original_remaining - 5, buf.remaining_mut());
/// ```
Expand Down Expand Up @@ -114,7 +114,7 @@ pub trait BufMut {
///
/// assert!(buf.has_remaining_mut());
///
/// buf.put("hello");
/// buf.put(&b"hello"[..]);
///
/// assert!(!buf.has_remaining_mut());
/// ```
Expand Down Expand Up @@ -217,7 +217,7 @@ pub trait BufMut {
///
/// buf.put_u8(b'h');
/// buf.put(&b"ello"[..]);
/// buf.put(" world");
/// buf.put(&b" world"[..]);
///
/// assert_eq!(buf, b"hello world");
/// ```
Expand Down
4 changes: 2 additions & 2 deletions src/bytes_mut.rs
Expand Up @@ -38,7 +38,7 @@ use crate::loom::sync::atomic::{self, AtomicPtr, AtomicUsize, Ordering};
///
/// buf.put_u8(b'h');
/// buf.put_u8(b'e');
/// buf.put("llo");
/// buf.put(&b"llo"[..]);
///
/// assert_eq!(&buf[..], b"hello");
///
Expand Down Expand Up @@ -219,7 +219,7 @@ impl BytesMut {
/// use std::thread;
///
/// let mut b = BytesMut::with_capacity(64);
/// b.put("hello world");
/// b.put(&b"hello world"[..]);
/// let b1 = b.freeze();
/// let b2 = b1.clone();
///
Expand Down
2 changes: 1 addition & 1 deletion tests/test_bytes.rs
Expand Up @@ -402,7 +402,7 @@ fn reserve_vec_recycling() {
let mut bytes = BytesMut::with_capacity(16);
assert_eq!(bytes.capacity(), 16);
let addr = bytes.as_ptr() as usize;
bytes.put("0123456789012345");
bytes.put("0123456789012345".as_bytes());
assert_eq!(bytes.as_ptr() as usize, addr);
bytes.advance(10);
assert_eq!(bytes.capacity(), 6);
Expand Down

0 comments on commit 491ebbf

Please sign in to comment.