Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ rust-version = "1.36.0"
version = "0.8.2"

[dependencies]
itoa = {version = "1.0.0", default-features = false }
serde = {version = "1.0.100", default-features = false }
itoa = { version = "1.0.0", default-features = false }
serde = { version = "1.0.100", default-features = false }

[dev-dependencies]
serde_derive = "1.0.100"
Expand All @@ -38,6 +38,8 @@ std = ["serde/std"]

alloc = ["serde/alloc"]

raw_value = []

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
101 changes: 99 additions & 2 deletions src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,63 @@ impl<'a> Deserializer<read::SliceRead<'a>> {
}
}

impl<'de, R: Read<'de>> Deserializer<R> {
#[cfg(feature = "raw_value")]
fn deserialize_raw_value<V>(&mut self, visitor: V) -> Result<V::Value>
where
V: de::Visitor<'de>,
{
self.read.begin_raw_buffering();
self.ignore_value()?;
self.read.end_raw_buffering(visitor)
}

#[cfg(feature = "raw_value")]
fn ignore_value(&mut self) -> Result<()> {
match self.parse_peek()? {
b'0'..=b'9' => {
self.buf.clear();
self.read.parse_byte_str(&mut self.buf)?;
Ok(())
}
b'i' => {
self.parse_next()?;
self.parse_integer()?;
Ok(())
}
b'l' => {
self.parse_next()?;
loop {
if self.parse_peek()? == b'e' {
self.parse_next()?;
break;
}
self.ignore_value()?;
}
Ok(())
}
b'd' => {
self.parse_next()?;
loop {
if self.parse_peek()? == b'e' {
self.parse_next()?;
break;
}

self.buf.clear();
self.read.parse_byte_str(&mut self.buf)?;
self.ignore_value()?;
}
Ok(())
}
_ => Err(Error::new(
ErrorKind::ExpectedSomeValue,
self.read.byte_offset(),
)),
}
}
}

impl<'de, R: Read<'de>> de::Deserializer<'de> for &mut Deserializer<R> {
type Error = Error;

Expand Down Expand Up @@ -393,10 +450,16 @@ impl<'de, R: Read<'de>> de::Deserializer<'de> for &mut Deserializer<R> {
}

#[inline]
fn deserialize_newtype_struct<V>(self, _name: &'static str, visitor: V) -> Result<V::Value>
fn deserialize_newtype_struct<V>(self, name: &'static str, visitor: V) -> Result<V::Value>
where
V: de::Visitor<'de>,
{
#[cfg(feature = "raw_value")]
if name == crate::raw::TOKEN {
return self.deserialize_raw_value(visitor);
}

let _ = name;
visitor.visit_newtype_struct(self)
}

Expand Down Expand Up @@ -481,10 +544,16 @@ where
}

#[inline]
fn deserialize_newtype_struct<V>(self, _name: &'static str, visitor: V) -> Result<V::Value>
fn deserialize_newtype_struct<V>(self, name: &'static str, visitor: V) -> Result<V::Value>
where
V: de::Visitor<'de>,
{
#[cfg(feature = "raw_value")]
if name == crate::raw::TOKEN {
return self.de.deserialize_raw_value(visitor);
}

let _ = name;
visitor.visit_newtype_struct(self)
}

Expand Down Expand Up @@ -770,4 +839,32 @@ mod tests {
assert_eq!(s, expected);
Ok(())
}

#[cfg(feature = "raw_value")]
#[test]
fn test_decode_raw_value_top_level() -> Result<()> {
use crate::RawValue;

let input = b"li1ei2ei3ee";
let raw: RawValue = from_slice(input)?;
assert_eq!(raw.get(), input);
Ok(())
}

#[cfg(feature = "raw_value")]
#[test]
fn test_decode_raw_value_struct_field() -> Result<()> {
use crate::RawValue;
use serde_derive::Deserialize;

#[derive(Deserialize)]
struct Envelope {
payload: RawValue,
}

let input = b"d7:payloadli1ei2eee";
let decoded: Envelope = from_slice(input)?;
assert_eq!(decoded.payload.get(), b"li1ei2ee");
Ok(())
}
}
9 changes: 9 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,14 @@ mod error;
pub mod read;
pub mod write;

#[cfg(feature = "raw_value")]
mod raw;

mod ser;
pub mod value;

#[doc(inline)]
pub use bipaddr::ByteIpAddr;
#[doc(inline)]
pub use bstring::ByteString;
#[doc(inline)]
Expand All @@ -134,3 +139,7 @@ pub use ser::{to_vec, Serializer};
#[doc(inline)]
#[cfg(feature = "std")]
pub use de::from_reader;

#[cfg(feature = "raw_value")]
#[cfg_attr(docsrs, doc(cfg(feature = "raw_value")))]
pub use raw::RawValue;
Loading