Skip to content

Commit cd82788

Browse files
committed
Auto merge of #97035 - JohnTitor:rollup-00ko07z, r=JohnTitor
Rollup of 6 pull requests Successful merges: - #95365 (Use default alloc_error_handler for hermit) - #96986 ([save-analysis] Reference the variant not enum at struct-literal cons…) - #96998 (rustdoc: remove weird, unused variable from source-files.js) - #97005 (Two small improvements of rustc_expand) - #97018 (Ensure that test fail if a JS error occurs) - #97031 (Drop tracking: handle invalid assignments better) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents cd6b881 + 6adb4b4 commit cd82788

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

alloc/src/alloc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ pub const fn handle_alloc_error(layout: Layout) -> ! {
387387
#[cfg(all(not(no_global_oom_handling), test))]
388388
pub use std::alloc::handle_alloc_error;
389389

390-
#[cfg(all(not(no_global_oom_handling), not(any(target_os = "hermit", test))))]
390+
#[cfg(all(not(no_global_oom_handling), not(test)))]
391391
#[doc(hidden)]
392392
#[allow(unused_attributes)]
393393
#[unstable(feature = "alloc_internals", issue = "none")]

0 commit comments

Comments
 (0)