Merge branch 'master' into sas-timeout

matrix_sdk/src/client.rs

@@ -966,7 +966,7 @@ impl Client {
     /// * `content` - The content of the message event.
     ///
     /// * `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.
     ///
     /// # Example
@@ -2357,7 +2357,7 @@ mod test {
             .unwrap();
 
         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]
@@ -2377,7 +2377,7 @@ mod test {
             .unwrap();
 
         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]

matrix_sdk_base/src/client.rs

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

matrix_sdk_base/src/state/json_store.rs

@@ -17,7 +17,7 @@ use crate::{Error, Result, Room, RoomState, Session};
 /// A default `StateStore` implementation that serializes state as json
 /// 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/*`.
 pub struct JsonStore {
     path: Arc<RwLock<PathBuf>>,