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

matrix-sdk: Fix the feature flags for real this time.

master
Damir Jelić 2020-05-08 11:07:08 +02:00
parent f5ec1f93ed
commit ef6458c9cd
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
matrix_sdk/Cargo.toml
View File

@ -24,14 +24,17 @@ serde_json = "1.0.52"
url = "2.1.1" url = "2.1.1"
uuid = { version = "0.8.1", features = ["v4"] } uuid = { version = "0.8.1", features = ["v4"] }
matrix-sdk-base = { version = "0.1.0", path = "../matrix_sdk_base" }
matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" } matrix-sdk-common = { version = "0.1.0", path = "../matrix_sdk_common" }
matrix-sdk-crypto = { version = "0.1.0", path = "../matrix_sdk_crypto", optional = true }
# Misc dependencies # Misc dependencies
thiserror = "1.0.16" thiserror = "1.0.16"
tracing = "0.1.13" tracing = "0.1.13"
[dependencies.matrix-sdk-base]
version = "0.1.0"
path = "../matrix_sdk_base"
default_features = false
[dependencies.tracing-futures] [dependencies.tracing-futures]
version = "0.2.4" version = "0.2.4"
default-features = false default-features = false

12
matrix_sdk_base/Cargo.toml
View File

@ -32,24 +32,14 @@ matrix-sdk-crypto = { path = "../matrix_sdk_crypto", optional = true }
# Misc dependencies # Misc dependencies
thiserror = "1.0.16" thiserror = "1.0.16"
tracing = "0.1.13"
[dependencies.tracing-futures]
version = "0.2.4"
default-features = false
features = ["std", "std-future"]
[dependencies.tokio] [dependencies.tokio]
version = "0.2.20" version = "0.2.20"
default-features = false default-features = false
features = ["sync", "time", "fs"] features = ["sync", "fs"]
[dev-dependencies] [dev-dependencies]
matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" } matrix-sdk-test = { version = "0.1.0", path = "../matrix_sdk_test" }
tokio = { version = "0.2.20", features = ["rt-threaded", "macros"] } tokio = { version = "0.2.20", features = ["rt-threaded", "macros"] }
ruma-identifiers = { version = "0.16.1", features = ["rand"] }
serde_json = "1.0.52"
tracing-subscriber = "0.2.5" tracing-subscriber = "0.2.5"
tempfile = "3.1.0" tempfile = "3.1.0"
mockito = "0.25.1"
lazy_static = "1.4.0"

2
matrix_sdk_base/src/base_client.rs
View File

@ -268,8 +268,8 @@ impl Client {
} }
pub(crate) async fn get_or_create_joined_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> { pub(crate) async fn get_or_create_joined_room(&self, room_id: &RoomId) -> Arc<RwLock<Room>> {
#[allow(clippy::or_fun_call)]
let mut rooms = self.joined_rooms.write().await; let mut rooms = self.joined_rooms.write().await;
#[allow(clippy::or_fun_call)]
rooms rooms
.entry(room_id.clone()) .entry(room_id.clone())
.or_insert(Arc::new(RwLock::new(Room::new( .or_insert(Arc::new(RwLock::new(Room::new(