Update to rust master

Author: alexcrichton

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "curl"
-version = "0.1.2"
+version = "0.1.3"
 authors = ["Carl Lerche <me@carllerche.com>"]
 license = "MIT"
 repository = "https://github.com/carllerche/curl-rust"

src/http/handle.rs

@@ -1,4 +1,4 @@
-use std::collections::hash_map::{HashMap, Occupied, Vacant};
+use std::collections::hash_map::{HashMap, Entry};
 
 use url::Url;
 
@@ -328,12 +328,12 @@ impl<'a, 'b> Request<'a, 'b> {
 
 fn append_header(map: &mut HashMap<String, Vec<String>>, key: &str, val: &str) {
     match map.entry(key.to_string()) {
-        Vacant(entry) => {
+        Entry::Vacant(entry) => {
             let mut values = Vec::new();
             values.push(val.to_string());
             entry.set(values)
         },
-        Occupied(entry) => entry.into_mut()
+        Entry::Occupied(entry) => entry.into_mut()
     };
 }
 

src/http/header.rs

@@ -98,13 +98,13 @@ pub fn parse<'a>(buf: &'a [u8]) -> Option<(&'a str, &'a str)> {
     }
 
     let name = match str::from_utf8(buf.slice(name_begin, name_end)) {
-        Some(v) => v,
-        None => return None
+        Ok(v) => v,
+        Err(..) => return None
     };
 
     let val = match str::from_utf8(buf.slice(val_begin, val_end)) {
-        Some(v) => v,
-        None => return None
+        Ok(v) => v,
+        Err(..) => return None
     };
 
     Some((name, val))

src/http/response.rs

@@ -51,8 +51,8 @@ impl fmt::Show for Response {
         }
 
         match str::from_utf8(self.body.as_slice()) {
-            Some(b) => try!(write!(fmt, "{}", b)),
-            None => try!(write!(fmt, "bytes[{}]", self.body.len()))
+            Ok(b) => try!(write!(fmt, "{}", b)),
+            Err(..) => try!(write!(fmt, "bytes[{}]", self.body.len()))
         }
 
         try!(write!(fmt, "]"));

src/test/server.rs

@@ -4,6 +4,7 @@ use std::io::net::tcp::{TcpListener,TcpStream};
 use std::io::timer;
 use std::io::{Acceptor, Listener};
 use std::str;
+use std::thread::Thread;
 use std::time::Duration;
 
 use self::Op::{SendBytes, ReceiveBytes, Wait, Shutdown};
@@ -131,7 +132,7 @@ impl OpSequence {
         fn insert_port(bytes: &'static [u8], port: uint) -> Vec<u8> {
             let s = str::from_utf8(bytes).unwrap();
             let p = port.to_string();
-            str::replace(s, "{PORT}", p.as_slice()).into_bytes()
+            s.replace("{PORT}", p.as_slice()).into_bytes()
         }
 
         fn parse_request<'a>(req: &'a [u8]) -> (&'a [u8],
@@ -222,17 +223,12 @@ impl OpSequenceResult {
 
 fn start_server() -> Handle {
     let (ops_tx, ops_rx) = channel();
-    let (ini_tx, ini_rx) = channel();
 
     let mut listener = TcpListener::bind("127.0.0.1:0").unwrap();
     let port = listener.socket_name().unwrap().port;
+    let mut srv = listener.listen().unwrap();
 
-    spawn(move|| {
-        let listener = listener;
-        let mut srv = listener.listen().unwrap();
-
-        ini_tx.send(true);
-
+    Thread::spawn(move || {
         loop {
             let (ops, resp_tx): (OpSequence, Sender<Result<(),String>>) = ops_rx.recv();
 
@@ -253,10 +249,7 @@ fn start_server() -> Handle {
 
             resp_tx.send(ops.apply(&mut sock, port as uint));
         }
-    });
-
-    // Wait until the server is listening
-    ini_rx.recv();
+    }).detach();
 
     Handle::new(ops_tx, port)
 }