From 21a03265a272e814f98509613fb76ba7d298edd7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 26 Jun 2023 15:04:13 +1000
Subject: [PATCH] Rename sanity check fields avoid conflict with outer span

---
 rslib/src/sync/collection/normal.rs | 2 +-
 rslib/src/sync/collection/sanity.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rslib/src/sync/collection/normal.rs b/rslib/src/sync/collection/normal.rs
index 6b8378b22..43b1d9b0d 100644
--- a/rslib/src/sync/collection/normal.rs
+++ b/rslib/src/sync/collection/normal.rs
@@ -94,7 +94,7 @@ impl NormalSyncer<'_> {
                                 },
                         } = &e
                         {
-                            debug!(?client, ?server, "sanity check failed");
+                            debug!(client_counts=?client, server_counts=?server, "sanity check failed");
                             self.col.set_schema_modified()?;
                         }
 
diff --git a/rslib/src/sync/collection/sanity.rs b/rslib/src/sync/collection/sanity.rs
index fb7f25255..17afece06 100644
--- a/rslib/src/sync/collection/sanity.rs
+++ b/rslib/src/sync/collection/sanity.rs
@@ -89,7 +89,7 @@ pub fn server_sanity_check(
     let mut server = match col.storage.sanity_check_info() {
         Ok(info) => info,
         Err(err) => {
-            info!(?client, ?err, "sanity check failed");
+            info!(client_counts=?client, ?err, "sanity check failed");
             return Ok(SanityCheckResponse {
                 status: SanityCheckStatus::Bad,
                 client: Some(client),
@@ -108,7 +108,7 @@ pub fn server_sanity_check(
         status: if client == server {
             SanityCheckStatus::Ok
         } else {
-            info!(?client, ?server, "sanity check failed");
+            info!(client_counts=?client, server_counts=?server, "sanity check failed");
             SanityCheckStatus::Bad
         },
         client: Some(client),