Skip to content

Commit bf9a661

Browse files
committed
Update for language changes
- Rename `str::from_bytes` -> `str::from_utf8` - Remove `impl Stream ...` which is now supported by std
1 parent d18e860 commit bf9a661

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

src/examples/client/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn main() {
2525
println("First 1024 bytes of response:");
2626
let mut buf = [0, ..1024];
2727
match response.read(buf) {
28-
Some(len) => printfln!("%?", str::from_bytes(buf.slice_to(len))),
28+
Some(len) => printfln!("%?", str::from_utf8(buf.slice_to(len))),
2929
None => println("uh oh, got None :-("),
3030
}
3131
// TODO: read it *all*, correctly

src/libhttp/buffer.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Memory buffers for the benefit of `std::rt::io::net` which has slow read/write.
22
3-
use std::rt::io::{Reader, Writer, Stream};
3+
use std::rt::io::{Reader, Writer};
44
use std::rt::io::net::tcp::TcpStream;
55
use std::cmp::min;
66
use std::ptr;
@@ -47,8 +47,6 @@ impl<T: Reader + Writer /*Stream*/> BufferedStream<T> {
4747
}
4848
}
4949

50-
impl<T: Stream> Stream for BufferedStream<T>;
51-
5250
impl<T: Reader> BufferedStream<T> {
5351
/// Poke a single byte back so it will be read next. For this to make sense, you must have just
5452
/// read that byte. If `self.pos` is 0 and `self.max` is not 0 (i.e. if the buffer is just

src/libhttp/headers/test_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn from_stream_with_str<T: HeaderConvertible>(s: &str) -> Option<T> {
1313
pub fn to_stream_into_str<T: HeaderConvertible>(v: &T) -> ~str {
1414
let mut writer = MemWriter::new();
1515
v.to_stream(&mut writer);
16-
str::from_bytes(writer.buf)
16+
str::from_utf8(writer.buf)
1717
}
1818

1919
// Verify that a value cannot be successfully interpreted as a header value of the specified type.

src/libhttp/memstream.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// TODO: submit upstream
22
3-
use std::rt::io::{Reader, Writer, Seek, SeekStyle, Stream};
3+
use std::rt::io::{Reader, Writer, Seek, SeekStyle};
44
use std::rt::io::mem::{MemReader, MemWriter};
55

66
/// Writes to an owned, growable byte vector but also implements read with fail-on-call methods.
@@ -29,8 +29,6 @@ impl Reader for MemWriterFakeStream {
2929
}
3030
}
3131

32-
impl Stream for MemWriterFakeStream;
33-
3432
/// Reads from an owned byte vector, but also implements write with fail-on-call methods.
3533
pub struct MemReaderFakeStream(MemReader);
3634

@@ -57,8 +55,6 @@ impl Writer for MemReaderFakeStream {
5755
}
5856
}
5957

60-
impl Stream for MemReaderFakeStream;
61-
6258
#[cfg(test)]
6359
mod test {
6460
use super::*;

0 commit comments

Comments
 (0)