|
2 | 2 |
|
3 | 3 | import option::{some, none};
|
4 | 4 | import uint::next_power_of_two;
|
5 |
| -import ptr::{addr_of, null}; |
| 5 | +import ptr::addr_of; |
6 | 6 |
|
7 | 7 | native "rust-intrinsic" mod rusti {
|
8 | 8 | fn vec_len<T>(&&v: [mutable? T]) -> uint;
|
9 | 9 | }
|
10 | 10 |
|
11 | 11 | native "c-stack-cdecl" mod rustrt {
|
12 |
| - fn vec_reserve_shared<T>(dummy: *util::void, |
13 |
| - t: *sys::type_desc, |
| 12 | + fn vec_reserve_shared<T>(t: *sys::type_desc, |
14 | 13 | &v: [mutable? T],
|
15 | 14 | n: uint);
|
16 |
| - fn vec_from_buf_shared<T>(dummy: *util::void, |
17 |
| - t: *sys::type_desc, |
| 15 | + fn vec_from_buf_shared<T>(t: *sys::type_desc, |
18 | 16 | ptr: *T,
|
19 | 17 | count: uint) -> [T];
|
20 | 18 | }
|
21 | 19 |
|
22 | 20 | /// Reserves space for `n` elements in the given vector.
|
23 | 21 | fn reserve<@T>(&v: [mutable? T], n: uint) {
|
24 |
| - rustrt::vec_reserve_shared(null(), sys::get_type_desc::<T>(), v, n); |
| 22 | + rustrt::vec_reserve_shared(sys::get_type_desc::<T>(), v, n); |
25 | 23 | }
|
26 | 24 |
|
27 | 25 | pure fn len<T>(v: [mutable? T]) -> uint { unchecked { rusti::vec_len(v) } }
|
@@ -358,7 +356,7 @@ mod unsafe {
|
358 | 356 | type vec_repr = {mutable fill: uint, mutable alloc: uint, data: u8};
|
359 | 357 |
|
360 | 358 | unsafe fn from_buf<@T>(ptr: *T, elts: uint) -> [T] {
|
361 |
| - ret rustrt::vec_from_buf_shared(null(), sys::get_type_desc::<T>(), |
| 359 | + ret rustrt::vec_from_buf_shared(sys::get_type_desc::<T>(), |
362 | 360 | ptr, elts);
|
363 | 361 | }
|
364 | 362 |
|
|
0 commit comments