diff options
| author | bors <bors@rust-lang.org> | 2017-02-03 22:55:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-03 22:55:28 +0000 |
| commit | 0648517faf1e2cf37c8b6770cbd0180a816ed9a0 (patch) | |
| tree | 72112e627a4cd04f53203220fbfc101c9e12b7b6 /src/liballoc | |
| parent | 86d9ed6c82c6745fec46b9ecf2fa91be7924dd16 (diff) | |
| parent | 626e754473da96a670c917b9cbefd1c1ea888a9c (diff) | |
| download | rust-0648517faf1e2cf37c8b6770cbd0180a816ed9a0.tar.gz rust-0648517faf1e2cf37c8b6770cbd0180a816ed9a0.zip | |
Auto merge of #39463 - alexcrichton:update-bootstrap, r=alexcrichton
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) { |