diff --git a/compiler/rustc_arena/src/lib.rs b/compiler/rustc_arena/src/lib.rs index b76e1e7ce65..f468bad635a 100644 --- a/compiler/rustc_arena/src/lib.rs +++ b/compiler/rustc_arena/src/lib.rs @@ -11,9 +11,13 @@ html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/", test(no_crate_inject, attr(deny(warnings))) )] +#![feature(array_value_iter_slice)] #![feature(dropck_eyepatch)] #![feature(new_uninit)] #![feature(maybe_uninit_slice)] +#![feature(array_value_iter)] +#![feature(min_const_generics)] +#![feature(min_specialization)] #![cfg_attr(test, feature(test))] use smallvec::SmallVec; @@ -114,6 +118,72 @@ impl Default for TypedArena { } } +trait IterExt { + fn alloc_from_iter(self, arena: &TypedArena) -> &mut [T]; +} + +impl IterExt for I +where + I: IntoIterator, +{ + #[inline] + default fn alloc_from_iter(self, arena: &TypedArena) -> &mut [T] { + let vec: SmallVec<[_; 8]> = self.into_iter().collect(); + vec.alloc_from_iter(arena) + } +} + +impl IterExt for std::array::IntoIter { + #[inline] + fn alloc_from_iter(self, arena: &TypedArena) -> &mut [T] { + let len = self.len(); + if len == 0 { + return &mut []; + } + // Move the content to the arena by copying and then forgetting it + unsafe { + let start_ptr = arena.alloc_raw_slice(len); + self.as_slice().as_ptr().copy_to_nonoverlapping(start_ptr, len); + mem::forget(self); + slice::from_raw_parts_mut(start_ptr, len) + } + } +} + +impl IterExt for Vec { + #[inline] + fn alloc_from_iter(mut self, arena: &TypedArena) -> &mut [T] { + let len = self.len(); + if len == 0 { + return &mut []; + } + // Move the content to the arena by copying and then forgetting it + unsafe { + let start_ptr = arena.alloc_raw_slice(len); + self.as_ptr().copy_to_nonoverlapping(start_ptr, len); + self.set_len(0); + slice::from_raw_parts_mut(start_ptr, len) + } + } +} + +impl IterExt for SmallVec { + #[inline] + fn alloc_from_iter(mut self, arena: &TypedArena) -> &mut [A::Item] { + let len = self.len(); + if len == 0 { + return &mut []; + } + // Move the content to the arena by copying and then forgetting it + unsafe { + let start_ptr = arena.alloc_raw_slice(len); + self.as_ptr().copy_to_nonoverlapping(start_ptr, len); + self.set_len(0); + slice::from_raw_parts_mut(start_ptr, len) + } + } +} + impl TypedArena { /// Allocates an object in the `TypedArena`, returning a reference to it. #[inline] @@ -191,19 +261,7 @@ impl TypedArena { #[inline] pub fn alloc_from_iter>(&self, iter: I) -> &mut [T] { assert!(mem::size_of::() != 0); - let mut vec: SmallVec<[_; 8]> = iter.into_iter().collect(); - if vec.is_empty() { - return &mut []; - } - // Move the content to the arena by copying it and then forgetting - // the content of the SmallVec - unsafe { - let len = vec.len(); - let start_ptr = self.alloc_raw_slice(len); - vec.as_ptr().copy_to_nonoverlapping(start_ptr, len); - vec.set_len(0); - slice::from_raw_parts_mut(start_ptr, len) - } + iter.alloc_from_iter(self) } /// Grows the arena.