Skip to content

Commit 1300803

Browse files
nikomatsakisbrson
authored andcommitted
---
yaml --- r: 5949 b: refs/heads/master c: e308f33 h: refs/heads/master i: 5947: cefbe2d v: v3
1 parent c58fafd commit 1300803

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: c81808a9f7263484a5949179d9f44491da7113cf
2+
refs/heads/master: e308f3346b0ff7b9ec2015058de218767ac66d89

trunk/src/lib/vec.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@
22

33
import option::{some, none};
44
import uint::next_power_of_two;
5-
import ptr::{addr_of, null};
5+
import ptr::addr_of;
66

77
native "rust-intrinsic" mod rusti {
88
fn vec_len<T>(&&v: [mutable? T]) -> uint;
99
}
1010

1111
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,
1413
&v: [mutable? T],
1514
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,
1816
ptr: *T,
1917
count: uint) -> [T];
2018
}
2119

2220
/// Reserves space for `n` elements in the given vector.
2321
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);
2523
}
2624

2725
pure fn len<T>(v: [mutable? T]) -> uint { unchecked { rusti::vec_len(v) } }
@@ -358,7 +356,7 @@ mod unsafe {
358356
type vec_repr = {mutable fill: uint, mutable alloc: uint, data: u8};
359357

360358
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>(),
362360
ptr, elts);
363361
}
364362

0 commit comments

Comments
 (0)