bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

core:: Eliminate str::sbuf. Replace with *u8

Browse source
This commit is contained in:
Brian Anderson 2012-03-14 13:56:00 -07:00
parent 3864d6d845
commit 9e480708a2
6 changed files with 138 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libcore/str.rs
View file

@ -90,7 +90,6 @@ export
char_at,
as_bytes,
as_buf,
sbuf,
reserve,
unsafe;
@ -184,7 +183,7 @@ fn from_chars(chs: [char]) -> str {
}
#[doc = "Create a Rust string from a null-terminated C string"]
fn from_cstr(cstr: sbuf) -> str unsafe {
fn from_cstr(cstr: *u8) -> str unsafe {
let mut curr = cstr, i = 0u;
while *curr != 0u8 {
i += 1u;
@ -194,7 +193,7 @@ fn from_cstr(cstr: sbuf) -> str unsafe {
}
#[doc = "Create a Rust string from a C string of the given length"]
fn from_cstr_len(cstr: sbuf, len: uint) -> str unsafe {
fn from_cstr_len(cstr: *u8, len: uint) -> str unsafe {
let mut buf: [u8] = [];
vec::reserve(buf, len + 1u);
vec::as_buf(buf) {|b| ptr::memcpy(b, cstr, len); }
@ -1248,13 +1247,10 @@ interop.
let s = str::as_buf(\"PATH\", { |path_buf| libc::getenv(path_buf) });
```
"]
fn as_buf<T>(s: str, f: fn(sbuf) -> T) -> T unsafe {
fn as_buf<T>(s: str, f: fn(*u8) -> T) -> T unsafe {
as_bytes(s) { |v| vec::as_buf(v, f) }
}
#[doc = "An unsafe buffer of bytes"]
type sbuf = *u8;
#[doc = "Allocate more memory for a string, up to `nn` + 1 bytes"]
fn reserve(&ss: str, nn: uint) {
rustrt::str_reserve_shared(ss, nn);