about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMichael Sullivan <sully@msully.net>2012-05-24 13:58:45 -0700
committerMichael Sullivan <sully@msully.net>2012-05-25 15:16:17 -0700
commit842f9d8616af2b652bbfe6d568a45106c6a12ffe (patch)
treede5cb5800e2eced87cd00795ba9251c675c291b9 /src
parent266fdd032b3b5ab7c573352f8bfbcb948d794dd6 (diff)
downloadrust-842f9d8616af2b652bbfe6d568a45106c6a12ffe.tar.gz
rust-842f9d8616af2b652bbfe6d568a45106c6a12ffe.zip
Remove from_const hack from vec.rs.
Diffstat (limited to 'src')
-rw-r--r--src/libcore/vec.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index d78063f8450..c72cef85cd1 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -199,13 +199,6 @@ fn from_mut<T>(+v: [mut T]) -> [T] unsafe {
     r
 }
 
-// This function only exists to work around bugs in the type checker.
-fn from_const<T>(+v: [const T]) -> [T] unsafe {
-    let r = ::unsafe::reinterpret_cast(v);
-    ::unsafe::forget(v);
-    r
-}
-
 // Accessors
 
 #[doc = "Returns the first element of a vector"]
@@ -534,7 +527,7 @@ Flattens a vector of vectors of T into a single vector of T.
 "]
 fn concat<T: copy>(v: [const [const T]]) -> [T] {
     let mut r = [];
-    for each(v) {|inner| r += from_const(inner); }
+    for each(v) {|inner| r += inner; }
     ret r;
 }
 
@@ -546,7 +539,7 @@ fn connect<T: copy>(v: [const [const T]], sep: T) -> [T] {
     let mut first = true;
     for each(v) {|inner|
         if first { first = false; } else { push(r, sep); }
-        r += from_const(inner);
+        r += inner;
     }
     ret r;
 }