char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'aledomu-master' into master

master
Damir Jelić 2020-09-23 13:45:44 +02:00
parent 7c3e751d6e 3070c98d26
commit 9a5345ec77
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix_sdk/Cargo.toml
View File

@ -20,6 +20,7 @@ default = ["encryption", "sqlite_cryptostore", "messages", "native-tls"]
messages = ["matrix-sdk-base/messages"] messages = ["matrix-sdk-base/messages"]
encryption = ["matrix-sdk-base/encryption", "dashmap"] encryption = ["matrix-sdk-base/encryption", "dashmap"]
sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"] sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"]
unstable-synapse-quirks = ["matrix-sdk-base/unstable-synapse-quirks"]
native-tls = ["reqwest/native-tls"] native-tls = ["reqwest/native-tls"]
rustls-tls = ["reqwest/rustls-tls"] rustls-tls = ["reqwest/rustls-tls"]
socks = ["reqwest/socks"] socks = ["reqwest/socks"]

2
matrix_sdk/src/lib.rs
View File

@ -24,6 +24,8 @@
//! 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.
//! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies
//! of Synapse in compliance with the Matrix API specification.
//! * `socks`: Enables SOCKS support in reqwest, the default HTTP client. //! * `socks`: Enables SOCKS support in reqwest, the default HTTP client.
#![deny( #![deny(

1
matrix_sdk_base/Cargo.toml
View File

@ -19,6 +19,7 @@ default = ["encryption", "sqlite_cryptostore", "messages"]
messages = [] messages = []
encryption = ["matrix-sdk-crypto"] encryption = ["matrix-sdk-crypto"]
sqlite_cryptostore = ["matrix-sdk-crypto/sqlite_cryptostore"] sqlite_cryptostore = ["matrix-sdk-crypto/sqlite_cryptostore"]
unstable-synapse-quirks = ["matrix-sdk-common/unstable-synapse-quirks"]
docs = ["encryption", "sqlite_cryptostore", "messages"] docs = ["encryption", "sqlite_cryptostore", "messages"]

2
matrix_sdk_base/src/lib.rs
View File

@ -24,6 +24,8 @@
//! 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.
//! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies
//! of Synapse in compliance with the Matrix API specification.
#![deny( #![deny(
missing_debug_implementations, missing_debug_implementations,
dead_code, dead_code,

3
matrix_sdk_common/Cargo.toml
View File

@ -10,6 +10,9 @@ readme = "README.md"
repository = "https://github.com/matrix-org/matrix-rust-sdk" repository = "https://github.com/matrix-org/matrix-rust-sdk"
version = "0.1.0" version = "0.1.0"
[features]
unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"]
[dependencies] [dependencies]
assign = "1.1.0" assign = "1.1.0"
instant = { version = "0.1.6", features = ["wasm-bindgen", "now"] } instant = { version = "0.1.6", features = ["wasm-bindgen", "now"] }