Skip to content

Commit 89564ba

Browse files
committed
Merge remote-tracking branch 'upstream/master' into box-alloc
2 parents 394f45d + 4266aa0 commit 89564ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+2359
-6026
lines changed

alloc/src/alloc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ pub fn handle_alloc_error(layout: Layout) -> ! {
383383
unsafe { oom_impl(layout) }
384384
}
385385

386-
#[cfg(not(any(test, bootstrap)))]
386+
#[cfg(not(any(target_os = "hermit", test, bootstrap)))]
387387
#[doc(hidden)]
388388
#[allow(unused_attributes)]
389389
#[unstable(feature = "alloc_internals", issue = "none")]

0 commit comments

Comments
 (0)