fill in the rest of the serde integration

sval-rs · Dec 20, 2023 · 6a3243e · 6a3243e
1 parent 825cb2c
commit 6a3243e
Show file tree

Hide file tree

Showing 3 changed files with 523 additions and 835 deletions.
diff --git a/buffer/src/error.rs b/buffer/src/error.rs
@@ -55,7 +55,10 @@ impl Error {
         Error(ErrorKind::OutsideContainer { method })
     }
 
-    pub(crate) fn invalid_value(reason: &'static str) -> Self {
+    /**
+    The given value is invalid.
+    */
+    pub fn invalid_value(reason: &'static str) -> Self {
         Error(ErrorKind::InvalidValue { reason })
     }
 

diff --git a/buffer/src/stream/flat.rs b/buffer/src/stream/flat.rs
@@ -205,6 +205,35 @@ impl<'sval, S: Stream<'sval>> sval::Stream<'sval> for FlatStream<'sval, S> {
         )
     }
 
+    fn tag(
+        &mut self,
+        tag: Option<&sval::Tag>,
+        label: Option<&sval::Label>,
+        index: Option<&sval::Index>,
+    ) -> sval::Result {
+        self.buffer_or_stream_with(
+            |buf| buf.tag(tag, label, index),
+            |stream| match stream.state {
+                State::Enum(ref mut stream) => {
+                    let stream = stream.take().ok_or_else(|| {
+                        Error::invalid_value(
+                            "failed to stream an enum; the stream is already completed",
+                        )
+                    })?;
+
+                    Ok(Some(stream.stream.tag(
+                        tag.cloned(),
+                        label.cloned(),
+                        index.cloned(),
+                    )?))
+                }
+                ref mut state => state.value_computed(&Tag(tag, label, index), |stream, _| {
+                    stream.tag(tag.cloned(), label.cloned(), index.cloned())
+                }),
+            },
+        )
+    }
+
     fn seq_begin(&mut self, num_entries: Option<usize>) -> sval::Result {
         self.buffer_or_begin_with(
             |buf| buf.seq_begin(num_entries),
@@ -532,24 +561,6 @@ impl<'sval, S: Stream<'sval>> sval::Stream<'sval> for FlatStream<'sval, S> {
         )
     }
 
-    fn tag(
-        &mut self,
-        tag: Option<&sval::Tag>,
-        label: Option<&sval::Label>,
-        index: Option<&sval::Index>,
-    ) -> sval::Result {
-        self.buffer_or_stream_with(
-            |buf| buf.tag(tag, label, index),
-            |stream| {
-                stream
-                    .state
-                    .value_computed(&Tag(tag, label, index), |stream, _| {
-                        stream.tag(tag.cloned(), label.cloned(), index.cloned())
-                    })
-            },
-        )
-    }
-
     fn null(&mut self) -> sval::Result {
         self.buffer_or_stream_with(
             |buf| buf.null(),