Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions src/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,77 @@ impl<T> WrapperTypeDecode for Box<T> {

impl<T: DecodeWithMemTracking> DecodeWithMemTracking for Box<T> {}

impl<T: Decode> Decode for Box<[T]> {
fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
let len = <Compact<u32>>::decode(input).map(|Compact(len)| len as usize)?;

input.descend_ref()?;

// Placement new is not yet stable, but we can just manually allocate a chunk of memory
// and convert it to a `Box` ourselves.
//
// The explicit types here are written out for clarity.
//
// TODO: Use `Box::new_uninit_slice` once that's stable.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is stable already, so use it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see this

let layout = core::alloc::Layout::array::<MaybeUninit<T>>(len)
.map_err(|_| Error::from("Item is too big and cannot be allocated"))?;

input.on_before_alloc_mem(layout.size())?;
let ptr: *mut MaybeUninit<T> = if layout.size() == 0 {
core::ptr::NonNull::dangling().as_ptr()
} else {
// SAFETY: Layout has a non-zero size so calling this is safe.
let ptr = unsafe { crate::alloc::alloc::alloc(layout) };

if ptr.is_null() {
crate::alloc::alloc::handle_alloc_error(layout);
}

ptr.cast()
};

// SAFETY: Constructing a `Box` from a piece of memory allocated with `std::alloc::alloc`
// is explicitly allowed as long as it was allocated with the global allocator
// and the memory layout matches.
//
// Constructing a `Box` from `NonNull::dangling` is also always safe as long
// as the underlying type is zero-sized.
let mut boxed_slice: Box<[MaybeUninit<T>]> = unsafe {
Box::from_raw(core::slice::from_raw_parts_mut(ptr, len))
};

for elem in &mut *boxed_slice {
T::decode_into(input, elem)?;
}
Comment on lines +637 to +639
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is gonna be mega slow for primitive types. We should use the same trick that we use in e.g. Decode for [T; N] or decode_vec_with_len where we read the data in bulk if T is a primitive type, otherwise this will be a huge performance trap.


// Decoding succeeded, so let's get rid of `MaybeUninit`.
// TODO: Use `Box::assume_init` once that's stable.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw the function is now stable.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As @bkchr mentioned, use Box::assume_init since it's stable now (MSRV is 1.82.0, which is old enough to use)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using this would require you to bump MSRV

current MSRV (Minimum Supported Rust Version) is 1.79.0 but this item is stable since 1.82.0
you may want to conditionally increase the MSRV considered by Clippy using the clippy::msrv attribute
for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv
#[warn(clippy::incompatible_msrv)] on by default [incompatible_msrv]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to bump the MSRV here; 1.82 should be old enough at this point.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah.

let boxed_slice = Vec::from(boxed_slice)
.into_iter()
.map(|elem| unsafe { MaybeUninit::assume_init(elem) })
.collect();

input.ascend_ref();
Ok(boxed_slice)
}
}

impl<T: DecodeWithMemTracking> DecodeWithMemTracking for Box<[T]> {}

impl Decode for Box<str> {
fn decode<I: Input>(input: &mut I) -> Result<Self, Error> {
// Guaranteed to create a Vec with capacity == len
let vec = Vec::from(Box::<[u8]>::decode(input)?);
// Guaranteed not to reallocate the vec, only transmute to String
let str = String::from_utf8(vec).map_err(|_| "Invalid utf8 sequence")?;

assert_eq!(str.capacity(), str.len());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assert_eq!(str.capacity(), str.len());
debug_assert_eq!(str.capacity(), str.len());

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could also have some sort of check that the underlying pointer did not change and there wasn't any reallocation.

Ok(str.into_boxed_str())
}
}

impl DecodeWithMemTracking for Box<str> {}

impl<T> WrapperTypeDecode for Rc<T> {
type Wrapped = T;

Expand Down Expand Up @@ -1717,6 +1788,39 @@ mod tests {
assert_eq!((x, y), Decode::decode(&mut &encoded[..]).unwrap());
}

#[test]
fn boxed_str_works() {
let s = "Hello world".to_owned();
let b = s.clone().into_boxed_str();

let encoded = b.encode();
assert_eq!(s.encode(), encoded);

assert_eq!(*b, *Box::<str>::decode(&mut &encoded[..]).unwrap());
}

#[test]
fn boxed_slice_of_primitives_works() {
let v = vec![1u32, 2, 3, 4, 5, 6];
let b = v.clone().into_boxed_slice();

let encoded = b.encode();
assert_eq!(v.encode(), encoded);

assert_eq!(*b, *Box::<[u32]>::decode(&mut &b.encode()[..]).unwrap());
}

#[test]
fn boxed_slice_of_strings_works() {
let v = vec!["mine".to_owned(), "yours".to_owned(), "his".to_owned()];
let b = v.clone().into_boxed_slice();

let encoded = b.encode();
assert_eq!(v.encode(), encoded);

assert_eq!(*b, *Box::<[String]>::decode(&mut &b.encode()[..]).unwrap());
}

#[test]
fn cow_works() {
let x = &[1u32, 2, 3, 4, 5, 6][..];
Expand Down