Skip to content

Commit

Permalink
Update packages to allow building with OpenSSL 1.1.1
Browse files Browse the repository at this point in the history
native-tls v0.1.5 does not detect OpenSSL 1.1.1 when building, causing
compile errors on systems that have it installed (such as Arch).

This patch swaps out the outdated evzht9h3nznqzwl crate with its upstream
websocket crate.

Fixes serenity-rs#394
  • Loading branch information
ColonelThirtyTwo committed Nov 6, 2018
1 parent edc6429 commit 00a9045
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ version = "~0.10"

[dependencies.hyper-native-tls]
optional = true
version = "0.2.4"
version = "0.3.0"

[dependencies.lazy_static]
optional = true
Expand All @@ -54,7 +54,7 @@ version = "0.13"

[dependencies.native-tls]
optional = true
version = "0.1"
version = "0.2"

[dependencies.opus]
optional = true
Expand All @@ -73,11 +73,11 @@ version = "~1.7"
optional = true
version = "~0.3"

[dependencies.evzht9h3nznqzwl]
[dependencies.websocket]
default-features = false
features = ["sync-ssl"]
optional = true
version = "0.0.3"
version = "0.21.1"

[dev-dependencies.matches]
version = "0.1.6"
Expand Down Expand Up @@ -111,7 +111,6 @@ model = ["builder", "http"]
standard_framework = ["framework"]
utils = ["base64"]
voice = ["byteorder", "gateway", "opus", "sodiumoxide"]
websocket = ["evzht9h3nznqzwl"]

[package.metadata.docs.rs]
all-features = true
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ extern crate sodiumoxide;
extern crate threadpool;
#[cfg(feature = "typemap")]
extern crate typemap;
#[cfg(feature = "evzht9h3nznqzwl")]
extern crate evzht9h3nznqzwl as websocket;
#[cfg(feature = "websocket")]
extern crate websocket;

#[allow(unused_imports)]
#[cfg(test)]
Expand Down

0 comments on commit 00a9045

Please sign in to comment.