Skip to content

Commit a1ed2f9

Browse files
committed
Remove bumpalo support
It now can be used via allocator-api2
1 parent acfcfeb commit a1ed2f9

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-all
2828
# Support for allocators that use allocator-api2
2929
allocator-api2 = { version = "0.2.6", optional = true, default-features = false, features = ["alloc"] }
3030

31-
# Optional support for bumpalo
32-
bumpalo = { version = "3.5.0", optional = true }
33-
3431
[dev-dependencies]
3532
lazy_static = "1.4"
3633
rand = { version = "0.8.3", features = ["small_rng"] }

src/raw/alloc.rs

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,52 +13,19 @@ mod inner {
1313
Err(_) => Err(()),
1414
}
1515
}
16-
17-
#[cfg(feature = "bumpalo")]
18-
unsafe impl Allocator for crate::BumpWrapper<'_> {
19-
#[inline]
20-
fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, core::alloc::AllocError> {
21-
match self.0.try_alloc_layout(layout) {
22-
Ok(ptr) => Ok(NonNull::slice_from_raw_parts(ptr, layout.size())),
23-
Err(_) => Err(core::alloc::AllocError),
24-
}
25-
}
26-
#[inline]
27-
unsafe fn deallocate(&self, _ptr: NonNull<u8>, _layout: Layout) {}
28-
}
2916
}
3017

3118
#[cfg(not(feature = "nightly"))]
3219
mod inner {
3320
use crate::alloc::alloc::Layout;
34-
use core::ptr::NonNull;
35-
36-
#[cfg(feature = "bumpalo")]
37-
use allocator_api2::alloc::AllocError;
38-
3921
pub use allocator_api2::alloc::{Allocator, Global};
22+
use core::ptr::NonNull;
4023

24+
#[allow(clippy::map_err_ignore)]
4125
pub(crate) fn do_alloc<A: Allocator>(alloc: &A, layout: Layout) -> Result<NonNull<u8>, ()> {
4226
match alloc.allocate(layout) {
4327
Ok(ptr) => Ok(ptr.cast()),
4428
Err(_) => Err(()),
4529
}
4630
}
47-
48-
#[cfg(feature = "bumpalo")]
49-
unsafe impl Allocator for crate::BumpWrapper<'_> {
50-
#[allow(clippy::map_err_ignore)]
51-
fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> {
52-
match self.0.try_alloc_layout(layout) {
53-
Ok(ptr) => Ok(unsafe {
54-
NonNull::new_unchecked(core::ptr::slice_from_raw_parts_mut(
55-
ptr.as_ptr(),
56-
layout.size(),
57-
))
58-
}),
59-
Err(_) => Err(AllocError),
60-
}
61-
}
62-
unsafe fn deallocate(&self, _ptr: NonNull<u8>, _layout: Layout) {}
63-
}
6431
}

0 commit comments

Comments
 (0)