Switch to our own websocket fork

servo · Mar 2, 2017 · da45177 · da45177
1 parent bf392a5
commit da45177
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
@@ -35,13 +35,13 @@ serde_derive = "0.9"
 serde_json = "0.9"
 servo_config = {path = "../config"}
 servo_url = {path = "../url"}
+servo-websocket = "0.18"
 threadpool = "1.0"
 time = "0.1.17"
 unicase = "1.4.0"
 url = {version = "1.2", features = ["heap_size"]}
 uuid = {version = "0.4", features = ["v4"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
-websocket = "0.17"
 
 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
 tinyfiledialogs = "2.5.9"
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
@@ -25,7 +25,7 @@ serde = "0.9"
 serde_derive = "0.9"
 servo_config = {path = "../config", features = ["servo"]}
 servo_url = {path = "../url", features = ["servo"]}
+servo-websocket = "0.18"
 url = {version = "1.2", features = ["heap_size"]}
 uuid = {version = "0.4", features = ["v4", "serde"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
-websocket = "0.17"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -80,13 +80,13 @@ servo_config = {path = "../config", features = ["servo"] }
 servo_geometry = {path = "../geometry" }
 servo_rand = {path = "../rand"}
 servo_url = {path = "../url", features = ["servo"] }
+servo-websocket = "0.18"
 smallvec = "0.1"
 style = {path = "../style"}
 style_traits = {path = "../style_traits"}
 time = "0.1.12"
 url = {version = "1.2", features = ["heap_size", "query_encoding"]}
 uuid = {version = "0.4", features = ["v4"]}
-websocket = "0.17"
 xml5ever = {version = "0.4", features = ["unstable"]}
 webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 webvr = {path = "../webvr"}

diff --git a/servo-tidy.toml b/servo-tidy.toml
@@ -21,10 +21,10 @@ rand = [
   "phf_generator",
   "rayon",
   "servo_rand",
+  "servo-websocket",
   "tempdir",
   "tempfile",
   "uuid",
-  "websocket",
   "ws",
 ]
 num = []