diff options
| author | bors <bors@rust-lang.org> | 2014-01-22 23:26:33 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-22 23:26:33 -0800 |
| commit | 19e0cbe420f7a78077b8009fdf1367073fc0c5eb (patch) | |
| tree | 10232b5958cac95aa3a437791661333f8e1818c1 /src/libstd/libc.rs | |
| parent | 52ba3b6414fe91cf92222581cb24e06894267c49 (diff) | |
| parent | b2ec71fc277ca590bb8bd26d3f7762d6406860e5 (diff) | |
auto merge of #11682 : thestinger/rust/vector, r=brson
This is just an initial implementation and does not yet fully replace `~[T]`. A generic initialization syntax for containers is missing, and the slice functionality needs to be reworked to make auto-slicing unnecessary. Traits for supporting indexing properly are also required. This also needs to be fixed to make ring buffers as easy to use as vectors. The tests and documentation for `~[T]` can be ported over to this type when it is removed. I don't really expect DST to happen for vectors as having both `~[T]` and `Vec<T>` is overcomplicated and changing the slice representation to 3 words is not at all appealing. Unlike with traits, it's possible (and easy) to implement `RcSlice<T>` and `GcSlice<T>` without compiler help.
Diffstat (limited to 'src/libstd/libc.rs')
| -rw-r--r-- | src/libstd/libc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/libc.rs b/src/libstd/libc.rs index 8975c2a7955..6f2d64ff668 100644 --- a/src/libstd/libc.rs +++ b/src/libstd/libc.rs @@ -3225,7 +3225,7 @@ pub mod funcs { pub fn calloc(nobj: size_t, size: size_t) -> *c_void; pub fn malloc(size: size_t) -> *mut c_void; pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void; - pub fn free(p: *c_void); + pub fn free(p: *mut c_void); pub fn exit(status: c_int) -> !; // Omitted: atexit. pub fn system(s: *c_char) -> c_int; |
