Skip to content

style: rename alloc to allocator #660

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

Merged
alejandro-vaz merged 1 commit into from
Sep 22, 2026
Merged

style: rename alloc to allocator #660

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
22 changes: 11 additions & 11 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ impl<T, const N: usize, A: Allocator> SmallVec<T, N, A> {
ptr: ptr.cast(),
size_bytes: old_cap * size_of::<T>(),
align: align_of::<T>(),
alloc: &self.allocator
allocator: &self.allocator
});
self.set_inline();
}
Expand Down Expand Up @@ -1570,16 +1570,16 @@ impl<T, const N: usize, A: Allocator> SmallVec<T, N, A> {
}
}

pub const fn new_in(alloc: A) -> SmallVec<T, N, A> {
pub const fn new_in(allocator: A) -> SmallVec<T, N, A> {
Self {
len: TaggedLen::new(0, false),
raw: RawSmallVec::new(),
allocator: alloc
allocator
}
}

pub fn try_with_capacity_in(capacity: usize, alloc: A) -> Result<Self, SmallVecError> {
let mut this = Self::new_in(alloc);
pub fn try_with_capacity_in(capacity: usize, allocator: A) -> Result<Self, SmallVecError> {
let mut this = Self::new_in(allocator);
if capacity > Self::inline_size() && !Self::IS_ZST {
// SAFETY: we checked all the preconditions
unsafe {
Expand All @@ -1593,8 +1593,8 @@ impl<T, const N: usize, A: Allocator> SmallVec<T, N, A> {
Ok(this)
}

pub fn with_capacity_in(capacity: usize, alloc: A) -> Self {
Self::try_with_capacity_in(capacity, alloc).unwrap_or_else(SmallVecError::handle)
pub fn with_capacity_in(capacity: usize, allocator: A) -> Self {
Self::try_with_capacity_in(capacity, allocator).unwrap_or_else(SmallVecError::handle)
}
}

Expand Down Expand Up @@ -1701,15 +1701,15 @@ struct DropDealloc<'a, A: Allocator> {
ptr: NonNull<u8>,
size_bytes: usize,
align: usize,
alloc: &'a A
allocator: &'a A
}

impl<A: Allocator> Drop for DropDealloc<'_, A> {
#[inline]
fn drop(&mut self) {
unsafe {
if self.size_bytes > 0 {
self.alloc.deallocate(
self.allocator.deallocate(
self.ptr,
Layout::from_size_align_unchecked(self.size_bytes, self.align)
);
Expand All @@ -1731,7 +1731,7 @@ impl<T, const N: usize, A: Allocator> Drop for SmallVec<T, N, A> {
ptr: NonNull::new_unchecked(ptr as *mut u8),
size_bytes: capacity * size_of::<T>(),
align: align_of::<T>(),
alloc: &self.allocator
allocator: &self.allocator
})
} else {
None
Expand All @@ -1754,7 +1754,7 @@ impl<T, const N: usize, A: Allocator> Drop for IntoIter<T, N, A> {
ptr: NonNull::new_unchecked(ptr as *mut u8),
size_bytes: capacity * size_of::<T>(),
align: align_of::<T>(),
alloc: &self.allocator
allocator: &self.allocator
})
} else {
None
Expand Down
Loading