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

Merge branch 'master' into crypto-improvements

master
Damir Jelić 2020-10-18 10:21:52 +02:00
parent 404cc410cc 8f99180c99
commit 0c1d33d43f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matrix_sdk/src/client.rs
View File

@ -826,7 +826,7 @@ impl Client {
/// let mut client = Client::new(homeserver).unwrap(); /// let mut client = Client::new(homeserver).unwrap();
/// ///
/// let generic_search_term = Some("matrix-rust-sdk"); /// let generic_search_term = Some("matrix-rust-sdk");
/// let filter = Some(assign!(Filter::new(), { generic_search_term })); /// let filter = assign!(Filter::new(), { generic_search_term });
/// let request = assign!(PublicRoomsFilterRequest::new(), { filter }); /// let request = assign!(PublicRoomsFilterRequest::new(), { filter });
/// ///
/// client.public_rooms_filtered(request).await; /// client.public_rooms_filtered(request).await;
@ -1292,7 +1292,9 @@ impl Client {
let mut data = Vec::new(); let mut data = Vec::new();
reader.read_to_end(&mut data)?; reader.read_to_end(&mut data)?;
let request = create_content::Request::new(content_type.essence_str(), data); let request = assign!(create_content::Request::new(data), {
content_type: Some(content_type.essence_str()),
});
self.http_client.upload(request).await self.http_client.upload(request).await
} }
@ -2404,7 +2406,7 @@ mod test {
.create(); .create();
let generic_search_term = Some("cheese"); let generic_search_term = Some("cheese");
let filter = Some(assign!(Filter::new(), { generic_search_term })); let filter = assign!(Filter::new(), { generic_search_term });
let request = assign!(PublicRoomsFilterRequest::new(), { filter }); let request = assign!(PublicRoomsFilterRequest::new(), { filter });
let get_public_rooms_filtered::Response { chunk, .. } = let get_public_rooms_filtered::Response { chunk, .. } =

2
matrix_sdk_common/Cargo.toml
View File

@ -21,7 +21,7 @@ js_int = "0.1.9"
[dependencies.ruma] [dependencies.ruma]
version = "0.0.1" version = "0.0.1"
git = "https://github.com/ruma/ruma" git = "https://github.com/ruma/ruma"
rev = "3869d75837b7aab60eef58fc834e498317d1e4a4" rev = "50eb700571480d1440e15a387d10f98be8abab59"
features = ["client-api", "unstable-pre-spec", "unstable-exhaustive-types"] features = ["client-api", "unstable-pre-spec", "unstable-exhaustive-types"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]