Replace servo-websocket by ws

This is heavily based on previous work done in #16012. Fixes #14517
servo · bors-servo · Aug 15, 2018 · Aug 11, 2018 · Aug 15, 2018 · 2e11bc10fb43238296435b13444ed9ca5b69a3bd
commit 2e11bc10fb43238296435b13444ed9ca5b69a3bd
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
@@ -41,13 +41,13 @@ servo_allocator = {path = "../allocator"}
 servo_arc = {path = "../servo_arc"}
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
-servo-websocket = { version = "0.21", default-features = false, features = ["sync"] }
 threadpool = "1.0"
 time = "0.1.17"
 unicase = "1.4.0"
 url = "1.2"
 uuid = {version = "0.6", features = ["v4"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
+ws = { version = "0.7", features = ["ssl"] }
 
 [dev-dependencies]
 embedder_traits = { path = "../embedder_traits", features = ["tests"] }

diff --git a/components/net/lib.rs b/components/net/lib.rs
@@ -40,7 +40,7 @@ extern crate unicase;
 extern crate url;
 extern crate uuid;
 extern crate webrender_api;
-extern crate websocket;
+extern crate ws;
 
 mod blob_loader;
 pub mod connector;