From 4c72be6911d688af0caa8d2cdca799798f86780b Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 16 Feb 2016 18:11:45 +0100 Subject: [PATCH] Update websocket --- components/net/Cargo.toml | 2 +- components/net/websocket_loader.rs | 4 ++-- components/net_traits/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- components/servo/Cargo.lock | 8 ++++---- ports/cef/Cargo.lock | 8 ++++---- ports/gonk/Cargo.lock | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index ae03f560029..5dc0f3ea1f7 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -42,5 +42,5 @@ mime_guess = "1.1.1" flate2 = "0.2.0" uuid = "0.1.16" url = {version = "0.5.5", features = ["heap_size"]} -websocket = "0.14.0" +websocket = "0.15.0" immeta = "0.3.1" diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs index 52a9bb6cff3..305a991e957 100644 --- a/components/net/websocket_loader.rs +++ b/components/net/websocket_loader.rs @@ -13,12 +13,12 @@ use std::ascii::AsciiExt; use std::sync::{Arc, Mutex, RwLock}; use std::thread; use util::thread::spawn_named; -use websocket::client::receiver::Receiver; use websocket::client::request::Url; -use websocket::client::sender::Sender; use websocket::header::{Headers, Origin, WebSocketProtocol}; use websocket::message::Type; +use websocket::receiver::Receiver; use websocket::result::{WebSocketError, WebSocketResult}; +use websocket::sender::Sender; use websocket::stream::WebSocketStream; use websocket::ws::receiver::Receiver as WSReceiver; use websocket::ws::sender::Sender as Sender_Object; diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 7b2c3b19b85..a2fccacf1d6 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -29,4 +29,4 @@ serde = "0.6" serde_macros = "0.6" stb_image = "0.2" url = {version = "0.5.5", features = ["heap_size"]} -websocket = "0.14.0" +websocket = "0.15.0" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 1f3b7874d22..103259cc1db 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -89,4 +89,4 @@ time = "0.1.12" unicase = "1.0" url = {version = "0.5.5", features = ["heap_size"]} uuid = "0.1.16" -websocket = "0.14.0" +websocket = "0.15.0" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index b14579ff98f..4ffbfad6be7 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1229,7 +1229,7 @@ dependencies = [ "util 0.0.1", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1280,7 +1280,7 @@ dependencies = [ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1631,7 +1631,7 @@ dependencies = [ "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)", ] @@ -2244,7 +2244,7 @@ dependencies = [ [[package]] name = "websocket" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 5247365b490..1a4fabf55cd 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1159,7 +1159,7 @@ dependencies = [ "util 0.0.1", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1191,7 +1191,7 @@ dependencies = [ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1517,7 +1517,7 @@ dependencies = [ "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)", ] @@ -2130,7 +2130,7 @@ dependencies = [ [[package]] name = "websocket" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6c9af5448b1..507f7cca1d8 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1140,7 +1140,7 @@ dependencies = [ "util 0.0.1", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.1.0 (git+https://github.com/glennw/webrender_traits)", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1172,7 +1172,7 @@ dependencies = [ "stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1498,7 +1498,7 @@ dependencies = [ "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "websocket 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "websocket 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)", ] @@ -2078,7 +2078,7 @@ dependencies = [ [[package]] name = "websocket" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",