Merge pull request #1 from BenTheElder/master

Fix for building on latest nightly.

Author: cyderize

Cargo.toml

@@ -17,5 +17,5 @@ keywords = ["websocket", "websockets", "rfc6455"]
 license = "MIT"
 
 [dependencies]
-url = "~0.2.2"
+url = "~0.2.5"
 sha1 = "~0.0.3"

src/lib.rs

@@ -23,7 +23,7 @@
 //! 	match stream {
 //! 		Ok(stream) => {
 //! 			// Spawn a new task for each connection to run in parallel
-//! 			spawn(proc() {
+//! 			spawn(move || {
 //! 				// Get a WebSocketClient from this stream
 //! 				let mut client = WebSocketClient::new(stream, WebSocketClientMode::RemoteClient); 
 //! 				

src/ws/handshake/request.rs

@@ -179,7 +179,7 @@ impl Clone for WebSocketRequest {
 	fn clone(&self) -> WebSocketRequest {
 		WebSocketRequest {
 			resource_name: self.resource_name.clone(),
-			http_version: self.http_version,
+			http_version: self.http_version.clone(),
 			headers: self.headers.clone(),
 		}
 	}

src/ws/handshake/response.rs

@@ -171,7 +171,7 @@ impl WebSocketResponse {
 impl Clone for WebSocketResponse {
 	fn clone(&self) -> WebSocketResponse {
 		WebSocketResponse {
-			http_version: self.http_version,
+			http_version: self.http_version.clone(),
 			status_code: self.status_code,
 			reason_phrase: self.reason_phrase.clone(),
 			headers: self.headers.clone(),

src/ws/handshake/version.rs

@@ -6,6 +6,7 @@ use std::fmt::{Show, Formatter, Result};
 use std::option::Option;
 
 /// Represents an HTTP version.
+#[deriving(Clone)]
 pub struct HttpVersion {
 	/// The major HTTP version.
 	pub version_major: u8,

src/ws/message/dataframe.rs

@@ -10,6 +10,7 @@ pub struct WebSocketDataFrame {
 	pub data: Vec<u8>,
 }
 
+#[deriving(Clone)]
 pub enum WebSocketOpcode {
 	Continuation,
 	Text,
@@ -29,6 +30,7 @@ pub enum WebSocketOpcode {
 	Control5,
 }
 
+#[deriving(Clone)]
 pub enum WebSocketDataFrameLength {
 	Tiny(u8),
 	Short(u16),
@@ -121,7 +123,7 @@ impl<R: Reader> ReadWebSocketDataFrame for R {
 			]);
 		}
 
-		let data = try!(self.read_exact(length.unwrap()));
+		let data = try!(self.read_exact(length.clone().unwrap()));
 
 		Ok(WebSocketDataFrame {
 			finished: finished,

src/ws/message/receive.rs

@@ -22,7 +22,7 @@ use std::clone::Clone;
 /// 
 /// let receiver = client.receiver();
 /// 
-/// spawn(proc() {
+/// spawn(move || {
 /// 	// Will continuously try to receive messages
 /// 	for message in receiver.incoming() {
 /// 		match message {
@@ -122,7 +122,7 @@ impl<S: Stream + Clone> WebSocketReceiver<S> {
 
 	fn create_message(&mut self) -> IoResult<WebSocketMessage> {
 		let data = self.data.clone();
-		let opcode = self.opcode;
+		let opcode = self.opcode.clone();
 
 		self.data = Vec::new();
 		self.opcode = None;