Replace several expects with error coercions.

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/rooms/event_handler/handle_outlier_pdu.rs

@@ -69,10 +69,8 @@ where
 	incoming_pdu
 		.insert("event_id".to_owned(), CanonicalJsonValue::String(event_id.as_str().to_owned()));
 
-	let pdu_event = serde_json::from_value::<PduEvent>(
-		serde_json::to_value(&incoming_pdu).expect("CanonicalJsonObj is a valid JsonValue"),
-	)
-	.map_err(|e| err!(Request(BadJson(debug_warn!("Event is not a valid PDU: {e}")))))?;
+	let pdu_event = serde_json::from_value::<PduEvent>(serde_json::to_value(&incoming_pdu)?)
+		.map_err(|e| err!(Request(BadJson(debug_warn!("Event is not a valid PDU: {e}")))))?;
 
 	check_room_id(room_id, &pdu_event)?;
 

src/service/rooms/timeline/create.rs

@@ -26,8 +26,8 @@ pub async fn create_hash_and_sign_event(
 	pdu_builder: PduBuilder,
 	sender: &UserId,
 	room_id: &RoomId,
-	_mutex_lock: &RoomMutexGuard, /* Take mutex guard to make sure users get the room
-	                               * state mutex */
+	// Take mutex guard to make sure users get the room state mutex
+	_mutex_lock: &RoomMutexGuard,
 ) -> Result<(PduEvent, CanonicalJsonObject)> {
 	let PduBuilder {
 		event_type,
@@ -100,36 +100,40 @@ pub async fn create_hash_and_sign_event(
 		}
 	}
 
+	let unsigned = if unsigned.is_empty() {
+		None
+	} else {
+		Some(to_raw_value(&unsigned)?)
+	};
+
+	let origin_server_ts = timestamp.map_or_else(
+		|| {
+			utils::millis_since_unix_epoch()
+				.try_into()
+				.expect("timestamp to UInt")
+		},
+		|ts| ts.get(),
+	);
+
 	let mut pdu = PduEvent {
 		event_id: ruma::event_id!("$thiswillbefilledinlater").into(),
 		room_id: room_id.to_owned(),
 		sender: sender.to_owned(),
 		origin: None,
-		origin_server_ts: timestamp.map_or_else(
-			|| {
-				utils::millis_since_unix_epoch()
-					.try_into()
-					.expect("u64 fits into UInt")
-			},
-			|ts| ts.get(),
-		),
+		origin_server_ts,
 		kind: event_type,
 		content,
 		state_key,
-		prev_events,
 		depth,
+		redacts,
+		unsigned,
+		hashes: EventHash { sha256: "aaa".to_owned() },
+		signatures: None,
+		prev_events,
 		auth_events: auth_events
 			.values()
 			.map(|pdu| pdu.event_id.clone())
 			.collect(),
-		redacts,
-		unsigned: if unsigned.is_empty() {
-			None
-		} else {
-			Some(to_raw_value(&unsigned)?)
-		},
-		hashes: EventHash { sha256: "aaa".to_owned() },
-		signatures: None,
 	};
 
 	let auth_fetch = |k: &StateEventType, s: &str| {