diff options
| author | bors <bors@rust-lang.org> | 2022-04-07 07:34:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-07 07:34:04 +0000 |
| commit | f565016eddc3cb812e647d54b06cfe74bdee2900 (patch) | |
| tree | 2ff05c1dacc33d2a51c0c80b3551301275a6e308 /library/alloc/src/alloc.rs | |
| parent | 8cd6080f6c778f6664ea3d12ca7848231707a627 (diff) | |
| parent | b500a78ac1dc70bef53ead56f5a1671bb9fd3d4c (diff) | |
| download | rust-f565016eddc3cb812e647d54b06cfe74bdee2900.tar.gz rust-f565016eddc3cb812e647d54b06cfe74bdee2900.zip | |
Auto merge of #95678 - pietroalbini:pa-1.62.0-bootstrap, r=Mark-Simulacrum
Bump bootstrap compiler to 1.61.0 beta This PR bumps the bootstrap compiler to the 1.61.0 beta. The first commit changes the stage0 compiler, the second commit applies the "mechanical" changes and the third and fourth commits apply changes explained in the relevant comments. r? `@Mark-Simulacrum`
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, ) { |