From 683a3db01fcd00998a36e494ee39209b3105cfb9 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Wed, 1 Aug 2018 07:37:38 -0600
Subject: Switch to bootstrapping from 1.29 beta

---
 src/libstd/alloc.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/libstd/alloc.rs')

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);
-- 
cgit 1.4.1-3-g733a5