diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2022-04-05 22:42:23 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2022-04-05 23:18:40 +0200 |
| commit | 181d28bb6110dc974879db20d433f21aa142db3a (patch) | |
| tree | 3bbc185fd9386b9cc050235fd1785820fcaaae5c /library/alloc/src/alloc.rs | |
| parent | e96538aeeb2a71e672e1d1a40dcaf0ad34a826b5 (diff) | |
| download | rust-181d28bb6110dc974879db20d433f21aa142db3a.tar.gz rust-181d28bb6110dc974879db20d433f21aa142db3a.zip | |
trivial cfg(bootstrap) changes
Diffstat (limited to 'library/alloc/src/alloc.rs')
| -rw-r--r-- | library/alloc/src/alloc.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs index 44389ee47b0..39f8f1d5a0e 100644 --- a/library/alloc/src/alloc.rs +++ b/library/alloc/src/alloc.rs @@ -326,16 +326,12 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 { #[cfg_attr(not(test), lang = "box_free")] #[inline] #[rustc_const_unstable(feature = "const_box", issue = "92521")] -#[cfg_attr(not(bootstrap), allow(drop_bounds))] // FIXME remove `~const Drop` and this attr when bumping // This signature has to be the same as `Box`, otherwise an ICE will happen. // When an additional parameter to `Box` is added (like `A: Allocator`), this has to be added here as // well. // For example if `Box` is changed to `struct Box<T: ?Sized, A: Allocator>(Unique<T>, A)`, // this function has to be changed to `fn box_free<T: ?Sized, A: Allocator>(Unique<T>, A)` as well. -pub(crate) const unsafe fn box_free< - T: ?Sized, - A: ~const Allocator + ~const Drop + ~const Destruct, ->( +pub(crate) const unsafe fn box_free<T: ?Sized, A: ~const Allocator + ~const Destruct>( ptr: Unique<T>, alloc: A, ) { |
