bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'upstream/master' into box-alloc

Browse source
This commit is contained in:
Tim Diekmann 2020-10-25 16:32:28 +01:00
commit 06e4497a04
989 changed files with 13348 additions and 12044 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -383,7 +383,7 @@ pub fn handle_alloc_error(layout: Layout) -> ! {
unsafe { oom_impl(layout) }
}
#[cfg(not(any(test, bootstrap)))]
#[cfg(not(any(target_os = "hermit", test, bootstrap)))]
#[doc(hidden)]
#[allow(unused_attributes)]
#[unstable(feature = "alloc_internals", issue = "none")]