summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-06-14 18:18:52 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-06-14 18:21:17 -0700
commit7ee7ba595562f801d486acefd2d338157df6b4cd (patch)
tree872ac01c69e362cc9f91073926f37c3afe1348b3 /src/libcore
parent7441a90fd97917a82e1b4e0ff9b016f4c5172475 (diff)
downloadrust-7ee7ba595562f801d486acefd2d338157df6b4cd.tar.gz
rust-7ee7ba595562f801d486acefd2d338157df6b4cd.zip
Remove workaround
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/vec.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index 7058f2202b9..1eab5b12ea0 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -1249,8 +1249,7 @@ mod unsafe {
     #[inline(always)]
     unsafe fn form_slice<T,U>(p: *T, len: uint, f: fn([T]/&) -> U) -> U {
         let pair = (p, len * sys::size_of::<T>());
-        // FIXME: should use &blk not &static here, but a snapshot is req'd
-        let v : *([T]/&static) =
+        let v : *([T]/&blk) =
             ::unsafe::reinterpret_cast(ptr::addr_of(pair));
         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 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] {
     //     iter::flat_map_to_vec(self, op)
     // }