dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(allocator): rename inner Vec type (#8566)

Browse source 
Pure refactor. Using a named type `InnerVec` is clearer than having `Vec` and `vec::Vec` (which `Vec` is which?).
This commit is contained in:
overlookmotel 2025-01-17 14:27:39 +00:00
parent 5a28d680f9
commit 68fab817f1
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/oxc_allocator/src/vec.rs
View file

@ -12,7 +12,7 @@ use std::{
slice::SliceIndex, slice::SliceIndex,
}; };
use allocator_api2::vec; use allocator_api2::vec::Vec as InnerVec;
use bumpalo::Bump; use bumpalo::Bump;
#[cfg(any(feature = "serialize", test))] #[cfg(any(feature = "serialize", test))]
use serde::{ser::SerializeSeq, Serialize, Serializer}; use serde::{ser::SerializeSeq, Serialize, Serializer};
@ -29,7 +29,7 @@ use crate::{Allocator, Box, String};
/// Note: This is not a soundness issue, as Rust does not support relying on `drop` /// Note: This is not a soundness issue, as Rust does not support relying on `drop`
/// being called to guarantee soundness. /// being called to guarantee soundness.
#[derive(PartialEq, Eq)] #[derive(PartialEq, Eq)]
pub struct Vec<'alloc, T>(ManuallyDrop<vec::Vec<T, &'alloc Bump>>); pub struct Vec<'alloc, T>(ManuallyDrop<InnerVec<T, &'alloc Bump>>);
/// SAFETY: Not actually safe, but for enabling `Send` for downstream crates. /// SAFETY: Not actually safe, but for enabling `Send` for downstream crates.
unsafe impl<T> Send for Vec<'_, T> {} unsafe impl<T> Send for Vec<'_, T> {}
@ -53,7 +53,7 @@ impl<'alloc, T> Vec<'alloc, T> {
/// ``` /// ```
#[inline] #[inline]
pub fn new_in(allocator: &'alloc Allocator) -> Self { pub fn new_in(allocator: &'alloc Allocator) -> Self {
Self(ManuallyDrop::new(vec::Vec::new_in(allocator))) Self(ManuallyDrop::new(InnerVec::new_in(allocator)))
} }
/// Constructs a new, empty `Vec<T>` with at least the specified capacity /// Constructs a new, empty `Vec<T>` with at least the specified capacity
@ -105,7 +105,7 @@ impl<'alloc, T> Vec<'alloc, T> {
/// ``` /// ```
#[inline] #[inline]
pub fn with_capacity_in(capacity: usize, allocator: &'alloc Allocator) -> Self { pub fn with_capacity_in(capacity: usize, allocator: &'alloc Allocator) -> Self {
Self(ManuallyDrop::new(vec::Vec::with_capacity_in(capacity, allocator))) Self(ManuallyDrop::new(InnerVec::with_capacity_in(capacity, allocator)))
} }
/// Create a new [`Vec`] whose elements are taken from an iterator and /// Create a new [`Vec`] whose elements are taken from an iterator and
@ -117,7 +117,7 @@ impl<'alloc, T> Vec<'alloc, T> {
let iter = iter.into_iter(); let iter = iter.into_iter();
let hint = iter.size_hint(); let hint = iter.size_hint();
let capacity = hint.1.unwrap_or(hint.0); let capacity = hint.1.unwrap_or(hint.0);
let mut vec = ManuallyDrop::new(vec::Vec::with_capacity_in(capacity, &**allocator)); let mut vec = ManuallyDrop::new(InnerVec::with_capacity_in(capacity, &**allocator));
vec.extend(iter); vec.extend(iter);
Self(vec) Self(vec)
} }
@ -146,7 +146,7 @@ impl<'alloc, T> Vec<'alloc, T> {
// `ptr` was allocated with correct size for `[T; N]`. // `ptr` was allocated with correct size for `[T; N]`.
// `len` and `capacity` are both `N`. // `len` and `capacity` are both `N`.
// Allocated size cannot be larger than `isize::MAX`, or `Box::new_in` would have failed. // Allocated size cannot be larger than `isize::MAX`, or `Box::new_in` would have failed.
let vec = unsafe { vec::Vec::from_raw_parts_in(ptr, N, N, &**allocator) }; let vec = unsafe { InnerVec::from_raw_parts_in(ptr, N, N, &**allocator) };
Self(ManuallyDrop::new(vec)) Self(ManuallyDrop::new(vec))
} }
@ -218,7 +218,7 @@ impl<'alloc> Vec<'alloc, u8> {
} }
impl<'alloc, T> ops::Deref for Vec<'alloc, T> { impl<'alloc, T> ops::Deref for Vec<'alloc, T> {
type Target = vec::Vec<T, &'alloc Bump>; type Target = InnerVec<T, &'alloc Bump>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.0 &self.0
@ -226,13 +226,13 @@ impl<'alloc, T> ops::Deref for Vec<'alloc, T> {
} }
impl<'alloc, T> ops::DerefMut for Vec<'alloc, T> { impl<'alloc, T> ops::DerefMut for Vec<'alloc, T> {
fn deref_mut(&mut self) -> &mut vec::Vec<T, &'alloc Bump> { fn deref_mut(&mut self) -> &mut InnerVec<T, &'alloc Bump> {
&mut self.0 &mut self.0
} }
} }
impl<'alloc, T> IntoIterator for Vec<'alloc, T> { impl<'alloc, T> IntoIterator for Vec<'alloc, T> {
type IntoIter = <vec::Vec<T, &'alloc Bump> as IntoIterator>::IntoIter; type IntoIter = <InnerVec<T, &'alloc Bump> as IntoIterator>::IntoIter;
type Item = T; type Item = T;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {