diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2014-10-01 00:08:07 +0300 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2014-10-02 16:36:00 +0300 |
| commit | 382f1bceb4e2a0496171f52d114a98ff8a86f9b7 (patch) | |
| tree | da16d223a789c24fdf4fd7d0117d541fe20b0643 | |
| parent | 84a4a07bbd66f9b1a05591d2c1a4964944c47d83 (diff) | |
| download | rust-382f1bceb4e2a0496171f52d114a98ff8a86f9b7.tar.gz rust-382f1bceb4e2a0496171f52d114a98ff8a86f9b7.zip | |
core: remove raw::GcBox.
| -rw-r--r-- | src/liballoc/lib.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/util.rs | 30 | ||||
| -rw-r--r-- | src/libcore/raw.rs | 9 |
3 files changed, 0 insertions, 40 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 503c484e469..c31d746d8f2 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -92,7 +92,6 @@ pub use boxed as owned; pub mod heap; pub mod libc_heap; -pub mod util; // Primitive types using the heaps above diff --git a/src/liballoc/util.rs b/src/liballoc/util.rs deleted file mode 100644 index d5f0d25fb01..00000000000 --- a/src/liballoc/util.rs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#![doc(hidden)] - -use core::mem; -use core::raw; - -#[inline] -#[deprecated] -pub fn get_box_size(body_size: uint, body_align: uint) -> uint { - let header_size = mem::size_of::<raw::GcBox<()>>(); - let total_size = align_to(header_size, body_align) + body_size; - total_size -} - -// Rounds size to the next alignment. Alignment is required to be a power of -// two. -#[inline] -fn align_to(size: uint, align: uint) -> uint { - assert!(align != 0); - (size + align - 1) & !(align - 1) -} diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs index 86b96ff15f1..a62e2ecdca0 100644 --- a/src/libcore/raw.rs +++ b/src/libcore/raw.rs @@ -20,15 +20,6 @@ use mem; -/// The representation of `std::gc::Gc`. -pub struct GcBox<T> { - pub ref_count: uint, - pub drop_glue: fn(ptr: *mut u8), - pub prev: *mut GcBox<T>, - pub next: *mut GcBox<T>, - pub data: T, -} - /// The representation of a Rust slice pub struct Slice<T> { pub data: *const T, |
