servo: Merge #15743 - Update ws to 0.6 (from nox:ws); r=emilio

This is exactly the same as 0.5.4, but without a semver violation.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ab1ef887c70a398db1f64486cb09c01e01f9e2c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4317792bf6ee139146a7b3c467ec9e99d29e8677
This commit is contained in:
Anthony Ramine 2017-02-26 06:26:05 -08:00
Родитель fcedbf4075
Коммит 0983af50c8
2 изменённых файлов: 4 добавлений и 4 удалений

6
servo/Cargo.lock сгенерированный
Просмотреть файл

@ -569,7 +569,7 @@ name = "debugger"
version = "0.0.1"
dependencies = [
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ws 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -3272,7 +3272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ws"
version = "0.5.4"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3602,7 +3602,7 @@ dependencies = [
"checksum websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a1a6ea5ed0367f32eb3d94dcc58859ef4294b5f75ba983dbf56ac314af45d"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
"checksum ws 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "97d37277cc93aa9f313a6e2363576988714f0e7f147179bb8f272ceb3e4a83b1"
"checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8"
"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
"checksum x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "124eb405bf0262a54e1a982d4ffe4cd1c24261bdb306e49996e2ce7d492284a8"
"checksum x11-dl 2.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf1f9986368c9bbdd8191a783a7ceb42e0c9c6d3348616c873f829b3288a139c"

Просмотреть файл

@ -14,4 +14,4 @@ crate_type = ["rlib"]
log = "0.3.5"
[target.'cfg(not(target_os = "android"))'.dependencies]
ws = "0.5.3"
ws = "0.6"