Merge branch 'reexport-reqwest' into master

2020-08-26 16:07:05 +02:00 · 2020-08-26 16:07:05 +02:00 · a2f7297941
parent 39628a308b 6fa365935f
commit a2f7297941
2 changed files with 2 additions and 0 deletions
--- a/matrix_sdk/Cargo.toml
+++ b/matrix_sdk/Cargo.toml
@ -22,6 +22,7 @@ encryption = ["matrix-sdk-base/encryption", "dashmap"]
 sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"]
 native-tls = ["reqwest/native-tls"]
 rustls-tls = ["reqwest/rustls-tls"]
+socks = ["reqwest/socks"]

 docs = ["encryption", "sqlite_cryptostore", "messages"]

--- a/matrix_sdk/src/lib.rs
+++ b/matrix_sdk/src/lib.rs
@ -24,6 +24,7 @@
 //! keys. If this is disabled and `encryption` support is enabled the keys will
 //! by default be stored only in memory and thus lost after the client is
 //! destroyed.
+//! * `socks`: Enables SOCKS support in reqwest, the default HTTP client.

 #![deny(
    missing_debug_implementations,