Skip to content

ManagedVec - to_array_of_refs simplification #2229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: feat/new-payment-obj
Choose a base branch
from
Open

ManagedVec - to_array_of_refs simplification #2229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions framework/base/src/types/managed/wrapped/managed_vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,8 @@ use crate::{
};
use alloc::{format, vec::Vec};
use core::{
borrow::Borrow,
cmp::Ordering,
fmt::Debug,
iter::FromIterator,
marker::PhantomData,
mem::{transmute_copy, ManuallyDrop, MaybeUninit},
borrow::Borrow, cmp::Ordering, fmt::Debug, iter::FromIterator, marker::PhantomData,
mem::MaybeUninit,
};

pub(crate) const INDEX_OUT_OF_RANGE_MSG: &[u8] = b"ManagedVec index out of range";
Expand Down Expand Up @@ -184,8 +180,7 @@ where
return None;
}

let mut result_uninit =
unsafe { MaybeUninit::<[MaybeUninit<T::Ref<'_>>; N]>::uninit().assume_init() };
let mut result_uninit: [MaybeUninit<T::Ref<'_>>; N] = [const { MaybeUninit::uninit() }; N];

for (index, value) in self.iter().enumerate() {
// length already checked
Expand All @@ -194,7 +189,8 @@ where
}
}

let result = unsafe { transmute_copy(&ManuallyDrop::new(result_uninit)) };
// TODO: replace with MaybeUninit::array_assume_init when it gets stabilized
let result = unsafe { core::mem::transmute_copy(&result_uninit) };
Some(result)
}

Expand Down
Loading