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

Merge branch 'master' into sas-timeout

master
Damir Jelić 2020-08-10 15:00:08 +02:00
parent 7bcdc2a3b6 ef5201cf35
commit 6f4d2022fd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix_sdk/src/client.rs
View File

@ -966,7 +966,7 @@ impl Client {
/// * `content` - The content of the message event. /// * `content` - The content of the message event.
/// ///
/// * `txn_id` - A unique `Uuid` that can be attached to a `MessageEvent` held /// * `txn_id` - A unique `Uuid` that can be attached to a `MessageEvent` held
/// in it's unsigned field as `transaction_id`. If not given one is created for the /// in its unsigned field as `transaction_id`. If not given one is created for the
/// message. /// message.
/// ///
/// # Example /// # Example
@ -2357,7 +2357,7 @@ mod test {
.unwrap(); .unwrap();
let logged_in = client.logged_in().await; let logged_in = client.logged_in().await;
assert!(logged_in, "Clint should be logged in"); assert!(logged_in, "Client should be logged in");
} }
#[tokio::test] #[tokio::test]
@ -2377,7 +2377,7 @@ mod test {
.unwrap(); .unwrap();
let logged_in = client.logged_in().await; let logged_in = client.logged_in().await;
assert!(logged_in, "Clint should be logged in"); assert!(logged_in, "Client should be logged in");
} }
#[tokio::test] #[tokio::test]

2
matrix_sdk_base/src/client.rs
View File

@ -177,7 +177,7 @@ pub enum RoomState<R> {
/// A no IO Client implementation. /// A no IO Client implementation.
/// ///
/// This Client is a state machine that receives responses and events and /// This Client is a state machine that receives responses and events and
/// accordingly updates it's state. /// accordingly updates its state.
#[derive(Clone)] #[derive(Clone)]
pub struct BaseClient { pub struct BaseClient {
/// The current client session containing our user id, device id and access /// The current client session containing our user id, device id and access

2
matrix_sdk_base/src/state/json_store.rs
View File

@ -17,7 +17,7 @@ use crate::{Error, Result, Room, RoomState, Session};
/// A default `StateStore` implementation that serializes state as json /// A default `StateStore` implementation that serializes state as json
/// and saves it to disk. /// and saves it to disk.
/// ///
/// When logged in the `JsonStore` appends the user_id to it's folder path, /// When logged in the `JsonStore` appends the user_id to its folder path,
/// so all files are saved in `my_client/user_id_localpart/*`. /// so all files are saved in `my_client/user_id_localpart/*`.
pub struct JsonStore { pub struct JsonStore {
path: Arc<RwLock<PathBuf>>, path: Arc<RwLock<PathBuf>>,