diff options
| author | bors <bors@rust-lang.org> | 2018-08-02 15:34:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-02 15:34:21 +0000 |
| commit | 03da14ba8cd22acbcfe1cca617f6c274999e5e9e (patch) | |
| tree | a33c2439348b38fceebbf1fc4604e06066c5e8a0 /src/libstd/alloc.rs | |
| parent | 5e92bf280b59fe0c187359743d7d430575fa30b1 (diff) | |
| parent | 683a3db01fcd00998a36e494ee39209b3105cfb9 (diff) | |
| download | rust-03da14ba8cd22acbcfe1cca617f6c274999e5e9e.tar.gz rust-03da14ba8cd22acbcfe1cca617f6c274999e5e9e.zip | |
Auto merge of #52949 - Mark-Simulacrum:snap, r=alexcrichton
Switch to bootstrapping from 1.29 beta r? @alexcrichton
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); |