diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-02-01 15:57:50 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-02-03 13:25:46 -0800 |
| commit | 626e754473da96a670c917b9cbefd1c1ea888a9c (patch) | |
| tree | ebaf4b7ee697f6bf5e28952884779c031ec5b7c6 /src/liballoc | |
| parent | 5de2a24b2ebfa42db8eadab911a107b4a67fabdb (diff) | |
| download | rust-626e754473da96a670c917b9cbefd1c1ea888a9c.tar.gz rust-626e754473da96a670c917b9cbefd1c1ea888a9c.zip | |
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.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/heap.rs | 8 |
2 files changed, 0 insertions, 9 deletions
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 @@ -144,14 +144,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] unsafe fn box_free<T: ?Sized>(ptr: *mut T) { |