core: str::as_slice is unneeded, yay! fixes std::net::tcp socket_buf test
i mistook an "unconstrained type" error, due to type-inference messup because i didnt have return vals in some closure wired-up right, for being due to not having a str as a str/& (a str will actually auto-coerce to a str/&, so str::as_slice was erroneously added. my bad).
This commit is contained in:
committed by
Brian Anderson
parent
942d3b527e
commit
708b5d986e
@@ -23,7 +23,6 @@ export
|
|||||||
as_buf,
|
as_buf,
|
||||||
as_c_str,
|
as_c_str,
|
||||||
unpack_slice,
|
unpack_slice,
|
||||||
as_slice,
|
|
||||||
|
|
||||||
// Adding things to and removing things from a string
|
// Adding things to and removing things from a string
|
||||||
push_char,
|
push_char,
|
||||||
@@ -1621,16 +1620,6 @@ pure fn unpack_slice<T>(s: str/&, f: fn(*u8, uint) -> T) -> T {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pure fn as_slice<T>(s: str,
|
|
||||||
start: uint, end: uint,
|
|
||||||
f: fn(str/&) -> T) -> T unsafe {
|
|
||||||
assert (start <= end);
|
|
||||||
assert (end <= len(s));
|
|
||||||
let p = ptr::addr_of(s);
|
|
||||||
f(::unsafe::reinterpret_cast(
|
|
||||||
(ptr::offset(p, start), (end - start) * sys::size_of::<u8>())))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc = "
|
#[doc = "
|
||||||
Reserves capacity for exactly `n` bytes in the given string, not including
|
Reserves capacity for exactly `n` bytes in the given string, not including
|
||||||
the null terminator.
|
the null terminator.
|
||||||
|
|||||||
@@ -1468,14 +1468,12 @@ mod test {
|
|||||||
|
|
||||||
fn buf_write(+w: io::writer, val: str) {
|
fn buf_write(+w: io::writer, val: str) {
|
||||||
log(debug, #fmt("BUF_WRITE: val len %?", str::len(val)));
|
log(debug, #fmt("BUF_WRITE: val len %?", str::len(val)));
|
||||||
str::as_slice(val, 0u, str::len(val) -1u) {|val_slice|
|
str::byte_slice(val) {|b_slice|
|
||||||
str::byte_slice(val_slice) {|b_slice|
|
|
||||||
log(debug, #fmt("BUF_WRITE: b_slice len %?",
|
log(debug, #fmt("BUF_WRITE: b_slice len %?",
|
||||||
vec::len(b_slice)));
|
vec::len(b_slice)));
|
||||||
w.write(b_slice)
|
w.write(b_slice)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fn buf_read(+r: io::reader, len: uint) -> str {
|
fn buf_read(+r: io::reader, len: uint) -> str {
|
||||||
let new_bytes = r.read_bytes(len);
|
let new_bytes = r.read_bytes(len);
|
||||||
|
|||||||
Reference in New Issue
Block a user