rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove workaround

Browse Source
This commit is contained in:
Tim Chevalier
2012-06-14 18:18:52 -07:00
parent 7441a90fd9
commit 7ee7ba5955
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcore/vec.rs
View File

@@ -1249,8 +1249,7 @@ mod unsafe {
#[inline(always)] #[inline(always)]
unsafe fn form_slice<T,U>(p: *T, len: uint, f: fn([T]/&) -> U) -> U { unsafe fn form_slice<T,U>(p: *T, len: uint, f: fn([T]/&) -> U) -> U {
let pair = (p, len * sys::size_of::<T>()); let pair = (p, len * sys::size_of::<T>());
// FIXME: should use &blk not &static here, but a snapshot is req'd let v : *([T]/&blk) =
let v : *([T]/&static) =
::unsafe::reinterpret_cast(ptr::addr_of(pair)); ::unsafe::reinterpret_cast(ptr::addr_of(pair));
f(*v) f(*v)
} }
@@ -1335,7 +1334,7 @@ impl extensions/&<A:copy> for [const A]/& {
fn map_to_vec<B>(op: fn(A) -> B) -> [B] { iter::map_to_vec(self, op) } fn map_to_vec<B>(op: fn(A) -> B) -> [B] { iter::map_to_vec(self, op) }
fn to_vec() -> [A] { iter::to_vec(self) } fn to_vec() -> [A] { iter::to_vec(self) }
// FIXME--bug in resolve prevents this from working // FIXME--bug in resolve prevents this from working (#2611)
// fn flat_map_to_vec<B:copy,IB:base_iter<B>>(op: fn(A) -> IB) -> [B] { // fn flat_map_to_vec<B:copy,IB:base_iter<B>>(op: fn(A) -> IB) -> [B] {
// iter::flat_map_to_vec(self, op) // iter::flat_map_to_vec(self, op)
// } // }