From aaa15c768c8fe6833b36831a515329380cc75903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 20 Aug 2020 10:19:55 +0200
Subject: [PATCH] crypto: Simplify the Olm message map construction.

---
 matrix_sdk_crypto/src/machine.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs
index ada96b3d..9becc8ad 100644
--- a/matrix_sdk_crypto/src/machine.rs
+++ b/matrix_sdk_crypto/src/machine.rs
@@ -1080,16 +1080,13 @@ impl OlmMachine {
                     Err(e) => return Err(e),
                 };
 
-                if !messages.contains_key(device.user_id()) {
-                    messages.insert(device.user_id().clone(), BTreeMap::new());
-                };
-
-                let user_messages = messages.get_mut(device.user_id()).unwrap();
-
-                user_messages.insert(
-                    DeviceIdOrAllDevices::DeviceId(device.device_id().into()),
-                    serde_json::value::to_raw_value(&encrypted)?,
-                );
+                messages
+                    .entry(device.user_id().clone())
+                    .or_insert(BTreeMap::new())
+                    .insert(
+                        DeviceIdOrAllDevices::DeviceId(device.device_id().into()),
+                        serde_json::value::to_raw_value(&encrypted)?,
+                    );
             }
 
             requests.push(OwnedToDeviceRequest {