Skip to content

Update allocator-api2 #299

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
zakarumych wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update allocator-api2 #299

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be9c309
Update allocator-api2
zakarumych Dec 11, 2025
30d65d1
Fix method resolution error
zakarumych Dec 11, 2025
0139e24
Update blink-alloc dependency to version 0.4
zakarumych Dec 11, 2025
8ce7d3c
Merge branch 'main' into update-allocator-api2
zakarumych Dec 23, 2025
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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ harness = false
# This dependency provides a version of the unstable nightly Rust `Allocator`
# trait on stable Rust. Enabling this feature means that `bumpalo` will
# implement its `Allocator` trait.
allocator-api2 = { version = "0.2.8", default-features = false, optional = true }
allocator-api2 = { version = "0.4.0", default-features = false, optional = true }

# This dependency is here to allow integration with Serde, if the `serde` feature is enabled
serde = { version = "1.0.171", optional = true }
Expand All @@ -51,7 +51,7 @@ criterion = "0.3.6"
rand = "0.8.5"
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.115"
blink-alloc = { version = "=0.3.1" }
blink-alloc = { version = "=0.4" }

# Make sure that criterion pulls in a rayon that supports our MSRV.
rayon = { version = "=1.10.0" }
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2471,9 +2471,9 @@ unsafe impl<'a, const MIN_ALIGN: usize> alloc::Alloc for &'a Bump<MIN_ALIGN> {

let new_layout = layout_from_size_align(new_size, layout.align())?;
if new_size <= old_size {
self.shrink(ptr, layout, new_layout)
Bump::<MIN_ALIGN>::shrink(self, ptr, layout, new_layout)
} else {
self.grow(ptr, layout, new_layout)
Bump::<MIN_ALIGN>::grow(self, ptr, layout, new_layout)
}
}
}
Expand Down