diff options
| author | bors <bors@rust-lang.org> | 2014-10-03 05:02:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-03 05:02:37 +0000 |
| commit | aa034cd3bac3155e0f6c74c399314b5ee32f88fc (patch) | |
| tree | 891acff8f9158a69e1884707ca3bfb70d749db2e /src/libcore | |
| parent | d0af3feebb57bc58c52de69ab51f92dc7082500b (diff) | |
| parent | d911936dbdc645133ad9605f45d2bf10b73e2b20 (diff) | |
| download | rust-aa034cd3bac3155e0f6c74c399314b5ee32f88fc.tar.gz rust-aa034cd3bac3155e0f6c74c399314b5ee32f88fc.zip | |
auto merge of #17725 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 2 | ||||
| -rw-r--r-- | src/libcore/raw.rs | 9 | ||||
| -rw-r--r-- | src/libcore/slice.rs | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 7e2ea492d4c..93c6f5bed85 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -57,7 +57,7 @@ html_playground_url = "http://play.rust-lang.org/")] #![no_std] -#![feature(globs, intrinsics, lang_items, macro_rules, managed_boxes, phase)] +#![feature(globs, intrinsics, lang_items, macro_rules, phase)] #![feature(simd, unsafe_destructor)] #![deny(missing_doc)] 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, diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index 1a00107a216..9f925f9d371 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -1218,7 +1218,7 @@ macro_rules! iterator { /// Immutable slice iterator #[experimental = "needs review"] -pub struct Items<'a, T> { +pub struct Items<'a, T: 'a> { ptr: *const T, end: *const T, marker: marker::ContravariantLifetime<'a> @@ -1261,7 +1261,7 @@ impl<'a, T> RandomAccessIterator<&'a T> for Items<'a, T> { /// Mutable slice iterator. #[experimental = "needs review"] -pub struct MutItems<'a, T> { +pub struct MutItems<'a, T: 'a> { ptr: *mut T, end: *mut T, marker: marker::ContravariantLifetime<'a>, |