From 92bf9d46e1a60d8166b37828268cedc16f7afd52 Mon Sep 17 00:00:00 2001
From: Brad Dunbar <dunbarb2@gmail.com>
Date: Sat, 2 Mar 2024 18:06:20 -0500
Subject: [PATCH 1/3] use ManuallyDrop in BytesMut#freeze
---
src/bytes_mut.rs | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/bytes_mut.rs b/src/bytes_mut.rs
index 734f4df92..8e59c6598 100644
--- a/src/bytes_mut.rs
+++ b/src/bytes_mut.rs
@@ -244,23 +244,22 @@ impl BytesMut {
/// ```
#[inline]
pub fn freeze(self) -> Bytes {
- if self.kind() == KIND_VEC {
+ let bytes = ManuallyDrop::new(self);
+ if bytes.kind() == KIND_VEC {
// Just re-use `Bytes` internal Vec vtable
unsafe {
- let off = self.get_vec_pos();
- let vec = rebuild_vec(self.ptr.as_ptr(), self.len, self.cap, off);
- mem::forget(self);
+ let off = bytes.get_vec_pos();
+ let vec = rebuild_vec(bytes.ptr.as_ptr(), bytes.len, bytes.cap, off);
let mut b: Bytes = vec.into();
b.advance(off);
b
}
} else {
- debug_assert_eq!(self.kind(), KIND_ARC);
+ debug_assert_eq!(bytes.kind(), KIND_ARC);
- let ptr = self.ptr.as_ptr();
- let len = self.len;
- let data = AtomicPtr::new(self.data.cast());
- mem::forget(self);
+ let ptr = bytes.ptr.as_ptr();
+ let len = bytes.len;
+ let data = AtomicPtr::new(bytes.data.cast());
unsafe { Bytes::with_vtable(ptr, len, data, &SHARED_VTABLE) }
}
}
From cad19a6cefbfbfac5cff7590b3976271e02c245b Mon Sep 17 00:00:00 2001
From: Brad Dunbar <dunbarb2@gmail.com>
Date: Sat, 2 Mar 2024 18:06:47 -0500
Subject: [PATCH 2/3] use ManuallyDrop in BytesMut#from_vec
---
src/bytes_mut.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bytes_mut.rs b/src/bytes_mut.rs
index 8e59c6598..c2943b54c 100644
--- a/src/bytes_mut.rs
+++ b/src/bytes_mut.rs
@@ -828,11 +828,11 @@ impl BytesMut {
// internal change could make a simple pattern (`BytesMut::from(vec)`)
// suddenly a lot more expensive.
#[inline]
- pub(crate) fn from_vec(mut vec: Vec<u8>) -> BytesMut {
+ pub(crate) fn from_vec(vec: Vec<u8>) -> BytesMut {
+ let mut vec = ManuallyDrop::new(vec);
let ptr = vptr(vec.as_mut_ptr());
let len = vec.len();
let cap = vec.capacity();
- mem::forget(vec);
let original_capacity_repr = original_capacity_to_repr(cap);
let data = (original_capacity_repr << ORIGINAL_CAPACITY_OFFSET) | KIND_VEC;
From 7bf4afd9d428ae5485bfb81cf2e114d478177895 Mon Sep 17 00:00:00 2001
From: Brad Dunbar <dunbarb2@gmail.com>
Date: Sat, 2 Mar 2024 18:07:04 -0500
Subject: [PATCH 3/3] use ManuallyDrop in Vec::from(bytes_mut)
---
src/bytes_mut.rs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/bytes_mut.rs b/src/bytes_mut.rs
index c2943b54c..fa7c6e950 100644
--- a/src/bytes_mut.rs
+++ b/src/bytes_mut.rs
@@ -1617,6 +1617,7 @@ impl PartialEq<Bytes> for BytesMut {
impl From<BytesMut> for Vec<u8> {
fn from(bytes: BytesMut) -> Self {
let kind = bytes.kind();
+ let bytes = ManuallyDrop::new(bytes);
let mut vec = if kind == KIND_VEC {
unsafe {
@@ -1633,7 +1634,7 @@ impl From<BytesMut> for Vec<u8> {
vec
} else {
- return bytes.deref().to_vec();
+ return ManuallyDrop::into_inner(bytes).deref().to_vec();
}
};
@@ -1644,8 +1645,6 @@ impl From<BytesMut> for Vec<u8> {
vec.set_len(len);
}
- mem::forget(bytes);
-
vec
}
}