Misc debug and trace log tweaks.

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

src/core/matrix/state_res/resolve.rs

@@ -92,8 +92,19 @@ where
 	// Split the unconflicted state map and the conflicted state set.
 	let (unconflicted_state, conflicted_states) = split_conflicted_state(state_maps).await;
 
-	trace!(?unconflicted_state, unconflicted = unconflicted_state.len(), "unresolved state");
-	debug!(?conflicted_states, conflicted = conflicted_states.len(), "unresolved states");
+	debug!(
+		unconflicted = unconflicted_state.len(),
+		conflicted = conflicted_states.len(),
+		"unresolved states",
+	);
+
+	trace!(
+		?unconflicted_state,
+		?conflicted_states,
+		unconflicted = unconflicted_state.len(),
+		conflicted = conflicted_states.len(),
+		"unresolved states",
+	);
 
 	if conflicted_states.is_empty() {
 		return Ok(unconflicted_state.into_iter().collect());

src/core/matrix/state_res/resolve/conflicted_subgraph.rs

@@ -8,7 +8,7 @@ use futures::{Future, FutureExt, Stream, StreamExt};
 use ruma::OwnedEventId;
 
 use crate::{
-	Result,
+	Result, debug,
 	matrix::Event,
 	utils::stream::{IterStream, automatic_width},
 };
@@ -52,6 +52,12 @@ where
 				.await;
 
 			let mut state = state.subgraph.lock().expect("locked");
+			debug!(
+				input_event = conflicted_event_ids.len(),
+				output_events = state.len(),
+				"conflicted subgraph state"
+			);
+
 			take(&mut *state)
 		})
 		.map(Set::into_iter)