From 181d28bb6110dc974879db20d433f21aa142db3a Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Tue, 5 Apr 2022 22:42:23 +0200 Subject: trivial cfg(bootstrap) changes --- library/alloc/src/alloc.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'library/alloc/src/alloc.rs') 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(Unique, A)`, // this function has to be changed to `fn box_free(Unique, 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( ptr: Unique, alloc: A, ) { -- cgit 1.4.1-3-g733a5