bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

step cfgs

Browse source
This commit is contained in:
Mark Rousskov 2024-03-19 09:34:31 -04:00
parent e4c58eb8da
commit 02f1930595
35 changed files with 50 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/alloc/src/alloc.rs
View file

@ -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)
}