Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9660 - servo:websocketup, r=jdm

Browse source 
Update websocket

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9660)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-23 23:51:54 +05:30
commit 7840aae1b9
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/net/Cargo.toml
View file

@ -42,5 +42,5 @@ mime_guess = "1.1.1"
flate2 = "0.2.0" flate2 = "0.2.0"
uuid = "0.1.16" uuid = "0.1.16"
url = {version = "0.5.5", features = ["heap_size"]} url = {version = "0.5.5", features = ["heap_size"]}
websocket = "0.14.0" websocket = "0.15.0"
immeta = "0.3.1" immeta = "0.3.1"

4
components/net/websocket_loader.rs
View file

@ -13,12 +13,12 @@ use std::ascii::AsciiExt;
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
use std::thread; use std::thread;
use util::thread::spawn_named; use util::thread::spawn_named;
use websocket::client::receiver::Receiver;
use websocket::client::request::Url; use websocket::client::request::Url;
use websocket::client::sender::Sender;
use websocket::header::{Headers, Origin, WebSocketProtocol}; use websocket::header::{Headers, Origin, WebSocketProtocol};
use websocket::message::Type; use websocket::message::Type;
use websocket::receiver::Receiver;
use websocket::result::{WebSocketError, WebSocketResult}; use websocket::result::{WebSocketError, WebSocketResult};
use websocket::sender::Sender;
use websocket::stream::WebSocketStream; use websocket::stream::WebSocketStream;
use websocket::ws::receiver::Receiver as WSReceiver; use websocket::ws::receiver::Receiver as WSReceiver;
use websocket::ws::sender::Sender as Sender_Object; use websocket::ws::sender::Sender as Sender_Object;

2
components/net_traits/Cargo.toml
View file

@ -29,4 +29,4 @@ serde = "0.6"
serde_macros = "0.6" serde_macros = "0.6"
stb_image = "0.2" stb_image = "0.2"
url = {version = "0.5.5", features = ["heap_size"]} url = {version = "0.5.5", features = ["heap_size"]}
websocket = "0.14.0" websocket = "0.15.0"

2
components/script/Cargo.toml
View file

@ -89,4 +89,4 @@ time = "0.1.12"
unicase = "1.0" unicase = "1.0"
url = {version = "0.5.5", features = ["heap_size"]} url = {version = "0.5.5", features = ["heap_size"]}
uuid = "0.1.16" uuid = "0.1.16"
websocket = "0.14.0" websocket = "0.15.0"

8
components/servo/Cargo.lock generated
View file

@ -1228,7 +1228,7 @@ dependencies = [
"util 0.0.1", "util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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]] [[package]]
@ -1279,7 +1279,7 @@ dependencies = [
"stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "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]] [[package]]
@ -1629,7 +1629,7 @@ dependencies = [
"url 0.5.5 (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", "util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)",
] ]
@ -2242,7 +2242,7 @@ dependencies = [
[[package]] [[package]]
name = "websocket" name = "websocket"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",

8
ports/cef/Cargo.lock generated
View file

@ -1158,7 +1158,7 @@ dependencies = [
"util 0.0.1", "util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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]] [[package]]
@ -1190,7 +1190,7 @@ dependencies = [
"stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "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]] [[package]]
@ -1515,7 +1515,7 @@ dependencies = [
"url 0.5.5 (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", "util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)",
] ]
@ -2128,7 +2128,7 @@ dependencies = [
[[package]] [[package]]
name = "websocket" name = "websocket"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",

8
ports/gonk/Cargo.lock generated
View file

@ -1139,7 +1139,7 @@ dependencies = [
"util 0.0.1", "util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "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]] [[package]]
@ -1171,7 +1171,7 @@ dependencies = [
"stb_image 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "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]] [[package]]
@ -1496,7 +1496,7 @@ dependencies = [
"url 0.5.5 (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", "util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)",
] ]
@ -2076,7 +2076,7 @@ dependencies = [
[[package]] [[package]]
name = "websocket" name = "websocket"
version = "0.14.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",