Merge branch 'reexport-reqwest' into master

master
Damir Jelić 2020-08-26 16:07:05 +02:00
commit a2f7297941
2 changed files with 2 additions and 0 deletions

View File

@ -22,6 +22,7 @@ encryption = ["matrix-sdk-base/encryption", "dashmap"]
sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"] sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"]
native-tls = ["reqwest/native-tls"] native-tls = ["reqwest/native-tls"]
rustls-tls = ["reqwest/rustls-tls"] rustls-tls = ["reqwest/rustls-tls"]
socks = ["reqwest/socks"]
docs = ["encryption", "sqlite_cryptostore", "messages"] docs = ["encryption", "sqlite_cryptostore", "messages"]

View File

@ -24,6 +24,7 @@
//! keys. If this is disabled and `encryption` support is enabled the keys will //! 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 //! by default be stored only in memory and thus lost after the client is
//! destroyed. //! destroyed.
//! * `socks`: Enables SOCKS support in reqwest, the default HTTP client.
#![deny( #![deny(
missing_debug_implementations, missing_debug_implementations,