Merge branch 'upstream' of https://github.com/klutzy/rust-http

Author: chris-morgan

src/examples/client/client.rs

@@ -25,7 +25,7 @@ fn main() {
     println("First 1024 bytes of response:");
     let mut buf = [0, ..1024];
     match response.read(buf) {
-        Some(len) => printfln!("%?", str::from_bytes(buf.slice_to(len))),
+        Some(len) => printfln!("%?", str::from_utf8(buf.slice_to(len))),
         None => println("uh oh, got None :-("),
     }
     // TODO: read it *all*, correctly

src/libhttp/headers/test_utils.rs

@@ -13,7 +13,7 @@ pub fn from_stream_with_str<T: HeaderConvertible>(s: &str) -> Option<T> {
 pub fn to_stream_into_str<T: HeaderConvertible>(v: &T) -> ~str {
     let mut writer = MemWriter::new();
     v.to_stream(&mut writer);
-    str::from_bytes(writer.buf)
+    str::from_utf8(writer.buf)
 }
 
 // Verify that a value cannot be successfully interpreted as a header value of the specified type.