Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12)

… and libc 0.2 and many other dependencies

3 files changed, 23 insertions, 25 deletions

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index f30c63db4a0..06e5f325ccc 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -48,10 +48,6 @@ path = "../canvas_traits"
 [dependencies.js]
 git = "https://github.com/servo/rust-mozjs"
 
-[dependencies.url]
-version = "0.2.36"
-features = ["query_encoding", "serde_serialization"]
-
 [dependencies.offscreen_gl_context]
 git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
 
@@ -62,10 +58,6 @@ branch = "servo"
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 
-[dependencies.hyper]
-version = "0.6"
-features = [ "serde-serialization" ]
-
 [dependencies.xml5ever]
 git = "https://github.com/Ygg01/xml5ever"
 features = ["unstable"]
@@ -76,13 +68,14 @@ cssparser = { version = "0.4", features = [ "serde-serialization" ] }
 log = "0.3"
 encoding = "0.2"
 fnv = "1.0"
+hyper = { version = "0.7", features = [ "serde-serialization" ] }
 time = "0.1.12"
 bitflags = "0.3"
 rustc-serialize = "0.3"
-libc = "0.1"
+libc = "0.2"
 unicase = "1.0"
 num = "0.1.24"
-websocket = "0.12.0"
+websocket = "0.14.0"
 uuid = "0.1.16"
 smallvec = "0.1"
 html5ever = { version = "0.2.1", features = ["unstable"] }
@@ -93,4 +86,5 @@ tendril = "0.1.1"
 rand = "0.3"
 serde = "0.6"
 caseless = "0.1.0"
-image = "0.4.0"
+image = "0.5.0"
+url = "0.5"
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 19adfbd490d..a3874f9b64f 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1659,7 +1659,7 @@ impl DocumentMethods for Document {
 
         if let Some(&Host::Ipv6(ipv6)) = origin.host() {
             // Omit square brackets for IPv6 addresses.
-            return DOMString::from(ipv6.serialize());
+            return DOMString::from(ipv6.to_string());
         }
 
         DOMString::from(origin.serialize_host().unwrap_or_else(|| "".to_owned()))
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index d96ee00311d..f2060566877 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -39,7 +39,7 @@ use websocket::client::receiver::Receiver;
 use websocket::client::request::Url;
 use websocket::client::sender::Sender;
 use websocket::header::Origin;
-use websocket::message::CloseData;
+use websocket::message::Type;
 use websocket::result::WebSocketResult;
 use websocket::stream::WebSocketStream;
 use websocket::ws::receiver::Receiver as WSReceiver;
@@ -264,23 +264,27 @@ impl WebSocket {
             sender.send(CommonScriptMsg::RunnableMsg(WebSocketEvent, open_task)).unwrap();
 
             for message in receiver.incoming_messages() {
-                let message = match message {
-                    Ok(Message::Text(text)) => MessageData::Text(text),
-                    Ok(Message::Binary(data)) => MessageData::Binary(data),
-                    Ok(Message::Ping(data)) => {
-                        ws_sender.lock().unwrap().send_message(Message::Pong(data)).unwrap();
+                let message: Message = match message {
+                    Ok(m) => m,
+                    Err(_) => break,
+                };
+                let message = match message.opcode {
+                    Type::Text => MessageData::Text(String::from_utf8_lossy(&message.payload).into_owned()),
+                    Type::Binary => MessageData::Binary(message.payload.into_owned()),
+                    Type::Ping => {
+                        let pong = Message::pong(message.payload);
+                        ws_sender.lock().unwrap().send_message(&pong).unwrap();
                         continue;
                     },
-                    Ok(Message::Pong(_)) => continue,
-                    Ok(Message::Close(data)) => {
-                        ws_sender.lock().unwrap().send_message(Message::Close(data)).unwrap();
+                    Type::Pong => continue,
+                    Type::Close => {
+                        ws_sender.lock().unwrap().send_message(&message).unwrap();
                         let task = box CloseTask {
                             addr: address,
                         };
                         sender.send(CommonScriptMsg::RunnableMsg(WebSocketEvent, task)).unwrap();
                         break;
                     },
-                    Err(_) => break,
                 };
                 let message_task = box MessageReceivedTask {
                     address: address.clone(),
@@ -385,7 +389,7 @@ impl WebSocketMethods for WebSocket {
         if send_data {
             let mut other_sender = self.sender.borrow_mut();
             let my_sender = other_sender.as_mut().unwrap();
-            let _ = my_sender.lock().unwrap().send_message(Message::Text(data.0));
+            let _ = my_sender.lock().unwrap().send_message(&Message::text(data.0));
         }
 
         Ok(())
@@ -404,7 +408,7 @@ impl WebSocketMethods for WebSocket {
         if send_data {
             let mut other_sender = self.sender.borrow_mut();
             let my_sender = other_sender.as_mut().unwrap();
-            let _ = my_sender.lock().unwrap().send_message(Message::Binary(data.clone_bytes()));
+            let _ = my_sender.lock().unwrap().send_message(&Message::binary(data.clone_bytes()));
         }
 
         Ok(())
@@ -420,7 +424,7 @@ impl WebSocketMethods for WebSocket {
             if let Some(sender) = sender.as_mut() {
                 let code: u16 = this.code.get();
                 let reason = this.reason.borrow().clone();
-                let _ = sender.lock().unwrap().send_message(Message::Close(Some(CloseData::new(code, reason))));
+                let _ = sender.lock().unwrap().send_message(&Message::close_because(code, reason));
             }
         }