diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2014-05-11 18:41:01 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2014-05-11 18:41:45 -0400 |
| commit | 69b321c84bea60b2ac727c4acbd9a34b19182209 (patch) | |
| tree | d3c82e585f6dab49fb155ee782c26e8be742bb8f /src/libstd/slice.rs | |
| parent | 32988db2bd82edc92f54c2d32fdcbd748ab78cd4 (diff) | |
| download | rust-69b321c84bea60b2ac727c4acbd9a34b19182209.tar.gz rust-69b321c84bea60b2ac727c4acbd9a34b19182209.zip | |
heap: replace `exchange_free` with `deallocate`
The `std::rt::heap` API is Rust's global allocator, so there's no need to have this as a separate API.
Diffstat (limited to 'src/libstd/slice.rs')
| -rw-r--r-- | src/libstd/slice.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs index b0868dd0daf..3c0d0efa766 100644 --- a/src/libstd/slice.rs +++ b/src/libstd/slice.rs @@ -109,7 +109,7 @@ use ops::Drop; use option::{None, Option, Some}; use ptr::RawPtr; use ptr; -use rt::heap::{exchange_malloc, exchange_free}; +use rt::heap::{exchange_malloc, deallocate}; use unstable::finally::try_finally; use vec::Vec; @@ -330,7 +330,7 @@ impl<'a, T: Clone> CloneableVector<T> for &'a [T] { ptr::read(&*p.offset(j)); } // FIXME: #13994 (should pass align and size here) - exchange_free(ret as *mut u8, 0, 8); + deallocate(ret as *mut u8, 0, 8); }); mem::transmute(ret) } @@ -377,7 +377,7 @@ impl<'a, T: Clone> CloneableVector<T> for &'a [T] { ptr::read(&*p.offset(j)); } // FIXME: #13994 (should pass align and size here) - exchange_free(ret as *mut u8, 0, 8); + deallocate(ret as *mut u8, 0, 8); }); mem::transmute(ret) } @@ -817,7 +817,7 @@ impl<T> Drop for MoveItems<T> { for _x in *self {} unsafe { // FIXME: #13994 (should pass align and size here) - exchange_free(self.allocation, 0, 8) + deallocate(self.allocation, 0, 8) } } } |
