Skip to content

Commit

Permalink
run fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
KodrAus committed Apr 10, 2023
1 parent b71d3b1 commit ab829c6
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 20 deletions.
10 changes: 8 additions & 2 deletions src/kv/key.rs
Expand Up @@ -110,13 +110,19 @@ mod sval_support {
use self::sval_ref::ValueRef;

impl<'a> Value for Key<'a> {
fn stream<'sval, S: sval::Stream<'sval> + ?Sized>(&'sval self, stream: &mut S) -> sval::Result {
fn stream<'sval, S: sval::Stream<'sval> + ?Sized>(
&'sval self,
stream: &mut S,
) -> sval::Result {
self.key.stream(stream)
}
}

impl<'a> ValueRef<'a> for Key<'a> {
fn stream_ref<S: self::sval::Stream<'a> + ?Sized>(&self, stream: &mut S) -> self::sval::Result {
fn stream_ref<S: self::sval::Stream<'a> + ?Sized>(
&self,
stream: &mut S,
) -> self::sval::Result {
self.key.stream(stream)
}
}
Expand Down
51 changes: 34 additions & 17 deletions src/kv/source.rs
Expand Up @@ -466,18 +466,31 @@ mod sval_support {
where
S: Source,
{
fn stream<'sval, SV: self::sval::Stream<'sval> + ?Sized>(&'sval self, stream: &mut SV) -> self::sval::Result {
fn stream<'sval, SV: self::sval::Stream<'sval> + ?Sized>(
&'sval self,
stream: &mut SV,
) -> self::sval::Result {
struct StreamVisitor<'a, V: ?Sized>(&'a mut V);

impl<'a, 'kvs, V: self::sval::Stream<'kvs> + ?Sized> Visitor<'kvs> for StreamVisitor<'a, V> {
fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
self.0.map_key_begin().map_err(|_| Error::msg("failed to stream map key"))?;
sval_ref::stream_ref(self.0, key).map_err(|_| Error::msg("failed to stream map key"))?;
self.0.map_key_end().map_err(|_| Error::msg("failed to stream map key"))?;
self.0
.map_key_begin()
.map_err(|_| Error::msg("failed to stream map key"))?;
sval_ref::stream_ref(self.0, key)
.map_err(|_| Error::msg("failed to stream map key"))?;
self.0
.map_key_end()
.map_err(|_| Error::msg("failed to stream map key"))?;

self.0.map_value_begin().map_err(|_| Error::msg("failed to stream map value"))?;
sval_ref::stream_ref(self.0, value).map_err(|_| Error::msg("failed to stream map value"))?;
self.0.map_value_end().map_err(|_| Error::msg("failed to stream map value"))?;
self.0
.map_value_begin()
.map_err(|_| Error::msg("failed to stream map value"))?;
sval_ref::stream_ref(self.0, value)
.map_err(|_| Error::msg("failed to stream map value"))?;
self.0
.map_value_end()
.map_err(|_| Error::msg("failed to stream map value"))?;

Ok(())
}
Expand All @@ -490,24 +503,30 @@ mod sval_support {
self.visit(&mut StreamVisitor(stream))
.map_err(|_| self::sval::Error::new())?;

stream
.map_end()
.map_err(|_| self::sval::Error::new())
stream.map_end().map_err(|_| self::sval::Error::new())
}
}

impl<S> self::sval::Value for AsList<S>
where
S: Source,
{
fn stream<'sval, SV: self::sval::Stream<'sval> + ?Sized>(&'sval self, stream: &mut SV) -> self::sval::Result {
fn stream<'sval, SV: self::sval::Stream<'sval> + ?Sized>(
&'sval self,
stream: &mut SV,
) -> self::sval::Result {
struct StreamVisitor<'a, V: ?Sized>(&'a mut V);

impl<'a, 'kvs, V: self::sval::Stream<'kvs> + ?Sized> Visitor<'kvs> for StreamVisitor<'a, V> {
fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error> {
self.0.seq_value_begin().map_err(|_| Error::msg("failed to stream seq value"))?;
self::sval_ref::stream_ref(self.0, (key, value)).map_err(|_| Error::msg("failed to stream seq value"))?;
self.0.seq_value_end().map_err(|_| Error::msg("failed to stream seq value"))?;
self.0
.seq_value_begin()
.map_err(|_| Error::msg("failed to stream seq value"))?;
self::sval_ref::stream_ref(self.0, (key, value))
.map_err(|_| Error::msg("failed to stream seq value"))?;
self.0
.seq_value_end()
.map_err(|_| Error::msg("failed to stream seq value"))?;

Ok(())
}
Expand All @@ -520,9 +539,7 @@ mod sval_support {
self.visit(&mut StreamVisitor(stream))
.map_err(|_| self::sval::Error::new())?;

stream
.seq_end()
.map_err(|_| self::sval::Error::new())
stream.seq_end().map_err(|_| self::sval::Error::new())
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/kv/value.rs
Expand Up @@ -417,7 +417,10 @@ impl<'v> self::serde::Serialize for Value<'v> {

#[cfg(feature = "kv_unstable_sval")]
impl<'v> self::sval::Value for Value<'v> {
fn stream<'sval, S: self::sval::Stream<'sval> + ?Sized>(&'sval self, stream: &mut S) -> self::sval::Result {
fn stream<'sval, S: self::sval::Stream<'sval> + ?Sized>(
&'sval self,
stream: &mut S,
) -> self::sval::Result {
self::sval::Value::stream(&self.inner, stream)
}
}
Expand Down

0 comments on commit ab829c6

Please sign in to comment.