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

Merge branch 'master' into new-state-store

master
Damir Jelić 2021-01-21 19:58:40 +01:00
parent 7d45417a17 7b8d2b5319
commit cf07fc8e8e
5 changed files with 7 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

@ -21,6 +21,7 @@ messages = ["matrix-sdk-base/messages"]
encryption = ["matrix-sdk-base/encryption", "dashmap"] encryption = ["matrix-sdk-base/encryption", "dashmap"]
sled_cryptostore = ["matrix-sdk-base/sled_cryptostore"] sled_cryptostore = ["matrix-sdk-base/sled_cryptostore"]
unstable-synapse-quirks = ["matrix-sdk-base/unstable-synapse-quirks"] unstable-synapse-quirks = ["matrix-sdk-base/unstable-synapse-quirks"]
markdown = ["matrix-sdk-base/markdown"]
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"]

1
matrix_sdk/src/lib.rs
View File

@ -43,6 +43,7 @@
//! destroyed. //! destroyed.
//! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies //! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies
//! of Synapse in compliance with the Matrix API specification. //! of Synapse in compliance with the Matrix API specification.
//! * `markdown`: Support for sending markdown formatted messages.
//! * `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

@ -20,6 +20,7 @@ messages = []
encryption = ["matrix-sdk-crypto"] encryption = ["matrix-sdk-crypto"]
sled_cryptostore = ["matrix-sdk-crypto/sled_cryptostore"] sled_cryptostore = ["matrix-sdk-crypto/sled_cryptostore"]
unstable-synapse-quirks = ["matrix-sdk-common/unstable-synapse-quirks"] unstable-synapse-quirks = ["matrix-sdk-common/unstable-synapse-quirks"]
markdown = ["matrix-sdk-common/markdown"]
docs = ["encryption", "sled_cryptostore", "messages"] docs = ["encryption", "sled_cryptostore", "messages"]

1
matrix_sdk_base/src/lib.rs
View File

@ -26,6 +26,7 @@
//! destroyed. //! destroyed.
//! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies //! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies
//! of Synapse in compliance with the Matrix API specification. //! of Synapse in compliance with the Matrix API specification.
//! * `markdown`: Support for sending markdown formatted messages.
#![deny( #![deny(
missing_debug_implementations, missing_debug_implementations,
trivial_casts, trivial_casts,

3
matrix_sdk_common/Cargo.toml
View File

@ -12,6 +12,7 @@ version = "0.2.0"
[features] [features]
unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"] unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"]
markdown = ["ruma/markdown"]
[dependencies] [dependencies]
instant = { version = "0.1.9", features = ["wasm-bindgen", "now"] } instant = { version = "0.1.9", features = ["wasm-bindgen", "now"] }
@ -20,6 +21,8 @@ async-trait = "0.1.42"
[dependencies.ruma] [dependencies.ruma]
version = "0.0.2" version = "0.0.2"
git = "https://github.com/ruma/ruma"
rev = "8c109d3c0a7ec66b352dc82677d30db7cb0723eb"
features = ["client-api", "unstable-pre-spec"] features = ["client-api", "unstable-pre-spec"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]