diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-01 07:37:38 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-08-01 11:59:08 -0600 |
| commit | 683a3db01fcd00998a36e494ee39209b3105cfb9 (patch) | |
| tree | 544717784e73eb774297aee52ce814937d3ad380 /src/libstd/alloc.rs | |
| parent | 8c069ceba81a0fffc1ce95aaf7e8339e11bf2796 (diff) | |
| download | rust-683a3db01fcd00998a36e494ee39209b3105cfb9.tar.gz rust-683a3db01fcd00998a36e494ee39209b3105cfb9.zip | |
Switch to bootstrapping from 1.29 beta
Diffstat (limited to 'src/libstd/alloc.rs')
| -rw-r--r-- | src/libstd/alloc.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 8db365cd21d..b9aba1e9cab 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -125,8 +125,7 @@ fn default_alloc_error_hook(layout: Layout) { #[cfg(not(test))] #[doc(hidden)] -#[cfg_attr(stage0, lang = "oom")] -#[cfg_attr(not(stage0), alloc_error_handler)] +#[alloc_error_handler] #[unstable(feature = "alloc_internals", issue = "0")] pub fn rust_oom(layout: Layout) -> ! { let hook = HOOK.load(Ordering::SeqCst); |