timezone format thing shows up in log (1)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/updates.rs b/src/updates.rs
index e5e5c4919789f43373929d5e17942bfd800b4317..59b090b3ad16e84a25543cba2eb0a6f0e8c0e6d1 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -105,10 +105,18 @@ enum TransmitUpdateEntry<'u> {
   },
   SetTableSize(Pos),
   #[serde(serialize_with="serialize_logentry")]
-  Log (&'u Timezone, &'u CommittedLogEntry),
+  Log(TransmitUpdateLogEntry<'u>),
   Error(&'u ErrorSignaledViaUpdate),
 }
 
+type TransmitUpdateLogEntry<'u> = (&'u Timezone, &'u CommittedLogEntry);
+
+#[derive(Debug,Serialize)]
+struct FormattedLogEntry<'u> {
+  when: String,
+  logent: &'u LogEntry,
+}
+
 // ========== implementation ==========
 
 // ---------- prepared updates, queued in memory ----------
@@ -480,7 +488,7 @@ impl PreparedUpdate {
           }
         },
         PUE::Log(logent) => {
-          TUE::Log(&tz, &logent)
+          TUE::Log((&tz, &logent))
         },
         &PUE::SetTableSize(size) => {
           TUE::SetTableSize(size)
@@ -502,11 +510,16 @@ impl PreparedUpdate {
   }
 }
 
-fn serialize_logentry<S:Serializer>(tz: &Timezone, logent: &CommittedLogEntry,
+impl<'u> Into<FormattedLogEntry<'u>> for TransmitUpdateLogEntry<'u> {
+  fn into(self) -> FormattedLogEntry<'u> {
+    let (tz, logent) = self;
+    let when = logent.when.render(&tz);
+    FormattedLogEntry { when, logent: &logent.logent }
+  }
+}
+
+fn serialize_logentry<S:Serializer>(&(tz,logent): &TransmitUpdateLogEntry,
                                     s:S) -> Result<S::Ok, S::Error> {
-  let mut tup = s.serialize_tuple(2)?;
-  let ts = logent.when.render(&tz);
-  tup.serialize_element(&ts)?;
-  tup.serialize_element(&logent.logent)?;
-  tup.end()
+  let f : FormattedLogEntry = (tz, logent).into();
+  f.serialize(s)
 }