diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-08-15 14:54:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 14:54:32 -0400 |
| commit | 97c6246385cbd807482bfc61514b240af29c9258 (patch) | |
| tree | 7a73a80759bcf170b6cb9b33d498f31f441d50bc /components/net/lib.rs | |
| parent | 2ed30c5951cb051950fbe82972e2befbcb8a3279 (diff) | |
| parent | 2e11bc10fb43238296435b13444ed9ca5b69a3bd (diff) | |
| download | servo-97c6246385cbd807482bfc61514b240af29c9258.tar.gz servo-97c6246385cbd807482bfc61514b240af29c9258.zip | |
Auto merge of #21386 - Eijebong:remove-websocket, r=jdm
Replace servo-websocket by ws
This is heavily based on previous work done in #16012.
Fixes #14517
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21386)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net/lib.rs')
| -rw-r--r-- | components/net/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/net/lib.rs b/components/net/lib.rs index cdeb7d54595..928d7ae191a 100644 --- 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; |