diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2012-08-25 16:53:44 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2012-08-30 20:40:52 -0700 |
| commit | 0e1a4a4da29caadba5d5cd86a5cd2587fdb0755d (patch) | |
| tree | 2f810735541c4c8c3b74070a1f733617e6a2845e /src/libcore | |
| parent | 536cb90a216a08870fbaac6aad93f77f0681537d (diff) | |
| download | rust-0e1a4a4da29caadba5d5cd86a5cd2587fdb0755d.tar.gz rust-0e1a4a4da29caadba5d5cd86a5cd2587fdb0755d.zip | |
libcore: rewrite vec::unsafe::from_buf in pure rust
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/vec.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs index 1533b07861c..448678abf7c 100644 --- a/src/libcore/vec.rs +++ b/src/libcore/vec.rs @@ -102,9 +102,6 @@ extern mod rustrt { fn vec_reserve_shared(++t: *sys::TypeDesc, ++v: **unsafe::VecRepr, ++n: libc::size_t); - fn vec_from_buf_shared(++t: *sys::TypeDesc, - ++ptr: *(), - ++count: libc::size_t) -> *unsafe::VecRepr; } #[abi = "rust-intrinsic"] @@ -1727,10 +1724,11 @@ mod unsafe { */ #[inline(always)] unsafe fn from_buf<T>(ptr: *T, elts: uint) -> ~[T] { - return ::unsafe::reinterpret_cast( - rustrt::vec_from_buf_shared(sys::get_type_desc::<T>(), - ptr as *(), - elts as size_t)); + let mut dst = ~[]; + reserve(dst, elts); + set_len(dst, elts); + as_buf(dst, |p_dst, _len_dst| ptr::memcpy(p_dst, ptr, elts)); + dst } /** |