From 141cbc22cbd04c4f3cf3d2af0a0f449322918d69 Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Fri, 7 Mar 2025 05:58:07 -0800 Subject: [PATCH] Rename `Vtable::to_*` -> `Vtable::into_*` (#776) --- src/bytes.rs | 30 +++++++++++++++--------------- src/bytes_mut.rs | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bytes.rs b/src/bytes.rs index cdb6ea5..e2c187c 100644 --- a/src/bytes.rs +++ b/src/bytes.rs @@ -112,9 +112,9 @@ pub(crate) struct Vtable { pub clone: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> Bytes, /// fn(data, ptr, len) /// - /// takes `Bytes` to value - pub to_vec: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> Vec, - pub to_mut: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> BytesMut, + /// `into_*` consumes the `Bytes`, returning the respective value. + pub into_vec: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> Vec, + pub into_mut: unsafe fn(&AtomicPtr<()>, *const u8, usize) -> BytesMut, /// fn(data) pub is_unique: unsafe fn(&AtomicPtr<()>) -> bool, /// fn(data, ptr, len) @@ -1045,7 +1045,7 @@ impl From for BytesMut { /// ``` fn from(bytes: Bytes) -> Self { let bytes = ManuallyDrop::new(bytes); - unsafe { (bytes.vtable.to_mut)(&bytes.data, bytes.ptr, bytes.len) } + unsafe { (bytes.vtable.into_mut)(&bytes.data, bytes.ptr, bytes.len) } } } @@ -1058,7 +1058,7 @@ impl From for Bytes { impl From for Vec { fn from(bytes: Bytes) -> Vec { let bytes = ManuallyDrop::new(bytes); - unsafe { (bytes.vtable.to_vec)(&bytes.data, bytes.ptr, bytes.len) } + unsafe { (bytes.vtable.into_vec)(&bytes.data, bytes.ptr, bytes.len) } } } @@ -1077,8 +1077,8 @@ impl fmt::Debug for Vtable { const STATIC_VTABLE: Vtable = Vtable { clone: static_clone, - to_vec: static_to_vec, - to_mut: static_to_mut, + into_vec: static_to_vec, + into_mut: static_to_mut, is_unique: static_is_unique, drop: static_drop, }; @@ -1181,8 +1181,8 @@ unsafe fn owned_drop(data: &mut AtomicPtr<()>, _ptr: *const u8, _len: usize) { static OWNED_VTABLE: Vtable = Vtable { clone: owned_clone, - to_vec: owned_to_vec, - to_mut: owned_to_mut, + into_vec: owned_to_vec, + into_mut: owned_to_mut, is_unique: owned_is_unique, drop: owned_drop, }; @@ -1191,16 +1191,16 @@ static OWNED_VTABLE: Vtable = Vtable { static PROMOTABLE_EVEN_VTABLE: Vtable = Vtable { clone: promotable_even_clone, - to_vec: promotable_even_to_vec, - to_mut: promotable_even_to_mut, + into_vec: promotable_even_to_vec, + into_mut: promotable_even_to_mut, is_unique: promotable_is_unique, drop: promotable_even_drop, }; static PROMOTABLE_ODD_VTABLE: Vtable = Vtable { clone: promotable_odd_clone, - to_vec: promotable_odd_to_vec, - to_mut: promotable_odd_to_mut, + into_vec: promotable_odd_to_vec, + into_mut: promotable_odd_to_mut, is_unique: promotable_is_unique, drop: promotable_odd_drop, }; @@ -1375,8 +1375,8 @@ const _: [(); 0 - mem::align_of::() % 2] = []; // Assert that the alignm static SHARED_VTABLE: Vtable = Vtable { clone: shared_clone, - to_vec: shared_to_vec, - to_mut: shared_to_mut, + into_vec: shared_to_vec, + into_mut: shared_to_mut, is_unique: shared_is_unique, drop: shared_drop, }; diff --git a/src/bytes_mut.rs b/src/bytes_mut.rs index d5db512..739b36e 100644 --- a/src/bytes_mut.rs +++ b/src/bytes_mut.rs @@ -1776,8 +1776,8 @@ unsafe fn rebuild_vec(ptr: *mut u8, mut len: usize, mut cap: usize, off: usize) static SHARED_VTABLE: Vtable = Vtable { clone: shared_v_clone, - to_vec: shared_v_to_vec, - to_mut: shared_v_to_mut, + into_vec: shared_v_to_vec, + into_mut: shared_v_to_mut, is_unique: shared_v_is_unique, drop: shared_v_drop, };