about summary refs log tree commit diff
path: root/library/alloc/src/alloc.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-03-20 13:43:41 +0000
committerbors <bors@rust-lang.org>2024-03-20 13:43:41 +0000
commita128516cf9de352ae1f9d430ed730363c7ca3c0c (patch)
tree3fb620c25ee078baee5747b2adbdf7c675a2fbe4 /library/alloc/src/alloc.rs
parentc86f3ac24f6b62b438c4bdc34ae73e8a1db60234 (diff)
parent9a22a0fdab7ca41d2aedcd2903743cd12438213b (diff)
downloadrust-a128516cf9de352ae1f9d430ed730363c7ca3c0c.tar.gz
rust-a128516cf9de352ae1f9d430ed730363c7ca3c0c.zip
Auto merge of #122754 - Mark-Simulacrum:bootstrap-bump, r=albertlarsan68
Bump to 1.78 bootstrap compiler

https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
Diffstat (limited to 'library/alloc/src/alloc.rs')
-rw-r--r--library/alloc/src/alloc.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs
index a5d28aa5252..6677534eafc 100644
--- a/library/alloc/src/alloc.rs
+++ b/library/alloc/src/alloc.rs
@@ -51,7 +51,7 @@ extern "Rust" {
 #[derive(Copy, Clone, Default, Debug)]
 #[cfg(not(test))]
 // the compiler needs to know when a Box uses the global allocator vs a custom one
-#[cfg_attr(not(bootstrap), lang = "global_alloc_ty")]
+#[lang = "global_alloc_ty"]
 pub struct Global;
 
 #[cfg(test)]
@@ -387,8 +387,7 @@ pub const fn handle_alloc_error(layout: Layout) -> ! {
     }
 
     #[cfg(not(feature = "panic_immediate_abort"))]
-    #[cfg_attr(not(bootstrap), allow(unused_unsafe))] // on bootstrap bump, remove unsafe block
-    unsafe {
+    {
         core::intrinsics::const_eval_select((layout,), ct_error, rt_error)
     }