diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2024-03-19 09:34:31 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2024-03-20 08:49:13 -0400 |
| commit | 02f193059528c6dd93f042ce277094f1d14cae77 (patch) | |
| tree | 29c6bd403851ec418f7f5241b3c8b74cd7aecbd4 /library/alloc/src | |
| parent | e4c58eb8da4ccd3af97b0254d2a3ed33a84b7cca (diff) | |
| download | rust-02f193059528c6dd93f042ce277094f1d14cae77.tar.gz rust-02f193059528c6dd93f042ce277094f1d14cae77.zip | |
step cfgs
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/alloc.rs | 5 |
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) } |