From 626e754473da96a670c917b9cbefd1c1ea888a9c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 1 Feb 2017 15:57:50 -0800
Subject: Bump version, upgrade bootstrap

This commit updates the version number to 1.17.0 as we're not on that version of
the nightly compiler, and at the same time this updates src/stage0.txt to
bootstrap from freshly minted beta compiler and beta Cargo.
---
 src/liballoc/boxed.rs | 1 -
 src/liballoc/heap.rs  | 8 --------
 2 files changed, 9 deletions(-)

(limited to 'src/liballoc')

diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index b6f490e09cd..82d361fb0e8 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -293,7 +293,6 @@ impl<T: ?Sized> Box<T> {
     }
 }
 
-#[cfg(not(stage0))]
 #[stable(feature = "rust1", since = "1.0.0")]
 unsafe impl<#[may_dangle] T: ?Sized> Drop for Box<T> {
     fn drop(&mut self) {
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index 81ed4be7763..51e6f2f8bd7 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -143,14 +143,6 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
     }
 }
 
-#[cfg(not(test))]
-#[cfg(stage0)]
-#[lang = "exchange_free"]
-#[inline]
-unsafe fn exchange_free(ptr: *mut u8, old_size: usize, align: usize) {
-    deallocate(ptr, old_size, align);
-}
-
 #[cfg(not(test))]
 #[lang = "box_free"]
 #[inline]
-- 
cgit 1.4.1-3-g733a5