Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify deser impl (redux) #488

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Unify deser impl (redux) #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdfb4f8
Introduce an error test case for deserialising a whole struct
ijackson Apr 28, 2022
10033cc
impl Deserializer for Config: forward everything to cache
ijackson Oct 23, 2023
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
160 changes: 47 additions & 113 deletions src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,122 +363,56 @@ impl<'de> de::VariantAccess<'de> for EnumAccess {
}
}

impl<'de> de::Deserializer<'de> for Config {
type Error = ConfigError;

/// Define `$method`s, `deserialize_foo`, by forwarding to `Value`
///
/// `($arg: $argtype, ...)`, if supplied, are the formal arguments
macro_rules! config_deserialize_via_value { { $(
$method:ident $( ( $( $arg:ident: $argtype:ty ),* ) )? ;
)* } => { $(
#[inline]
fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
where
V: de::Visitor<'de>,
{
// Delegate deserialization to Value
de::Deserializer::deserialize_any(self.cache, visitor)
fn $method<V: de::Visitor<'de>>(
self,
$( $( $arg: $argtype, )* )?
visitor: V,
) -> Result<V::Value> {
self.cache.$method( $( $( $arg, )* )? visitor)
}
)* } }

#[inline]
fn deserialize_bool<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
visitor.visit_bool(self.cache.into_bool()?)
}

#[inline]
fn deserialize_i8<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(signed, self.cache, "8");
visitor.visit_i8(num)
}

#[inline]
fn deserialize_i16<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(signed, self.cache, "16");
visitor.visit_i16(num)
}

#[inline]
fn deserialize_i32<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(signed, self.cache, "32");
visitor.visit_i32(num)
}

#[inline]
fn deserialize_i64<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(signed, self.cache, "64");
visitor.visit_i64(num)
}

#[inline]
fn deserialize_u8<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(unsigned, self.cache, "8");
visitor.visit_u8(num)
}

#[inline]
fn deserialize_u16<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(unsigned, self.cache, "16");
visitor.visit_u16(num)
}

#[inline]
fn deserialize_u32<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(unsigned, self.cache, "32");
visitor.visit_u32(num)
}

#[inline]
fn deserialize_u64<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
let num = try_convert_number!(unsigned, self.cache, "64");
visitor.visit_u64(num)
}

#[inline]
fn deserialize_f32<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
visitor.visit_f32(self.cache.into_float()? as f32)
}

#[inline]
fn deserialize_f64<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
visitor.visit_f64(self.cache.into_float()?)
}

#[inline]
fn deserialize_str<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
visitor.visit_string(self.cache.into_string()?)
}

#[inline]
fn deserialize_string<V: de::Visitor<'de>>(self, visitor: V) -> Result<V::Value> {
visitor.visit_string(self.cache.into_string()?)
}

#[inline]
fn deserialize_option<V>(self, visitor: V) -> Result<V::Value>
where
V: de::Visitor<'de>,
{
// Match an explicit nil as None and everything else as Some
match self.cache.kind {
ValueKind::Nil => visitor.visit_none(),
_ => visitor.visit_some(self),
}
}

fn deserialize_enum<V>(
self,
name: &'static str,
variants: &'static [&'static str],
visitor: V,
) -> Result<V::Value>
where
V: de::Visitor<'de>,
{
visitor.visit_enum(EnumAccess {
value: self.cache,
name,
variants,
})
}
impl<'de> de::Deserializer<'de> for Config {
type Error = ConfigError;

serde::forward_to_deserialize_any! {
char seq
bytes byte_buf map struct unit newtype_struct
identifier ignored_any unit_struct tuple_struct tuple
config_deserialize_via_value! {
deserialize_any;
deserialize_bool;
deserialize_i8;
deserialize_i16;
deserialize_i32;
deserialize_i64;
deserialize_u8;
deserialize_u16;
deserialize_u32;
deserialize_u64;
deserialize_f32;
deserialize_f64;
deserialize_str;
deserialize_string;
deserialize_option;

deserialize_char;
deserialize_seq;
deserialize_bytes;
deserialize_byte_buf;
deserialize_map;
deserialize_unit;
deserialize_identifier;
deserialize_ignored_any;

deserialize_enum(name: &'static str, variants: &'static [&'static str]);
deserialize_unit_struct(name: &'static str);
deserialize_newtype_struct(name: &'static str);
deserialize_tuple(n: usize);
deserialize_tuple_struct(name: &'static str, n: usize);
deserialize_struct(name: &'static str, fields: &'static [&'static str]);
}
}
22 changes: 22 additions & 0 deletions tests/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,28 @@ fn test_error_type() {
);
}

#[test]
fn test_error_deser_whole() {
#[derive(Deserialize, Debug)]
struct Place {
#[allow(dead_code)]
name: usize, // is actually s string
}

#[derive(Deserialize, Debug)]
struct Output {
#[allow(dead_code)]
place: Place,
}

let c = make();
let err = c.try_deserialize::<Output>().unwrap_err().to_string();
assert_eq!(
err,
"invalid type: string \"Torre di Pisa\", expected an integer for key `place.name` in tests/Settings.toml",
);
}

#[test]
fn test_error_type_detached() {
let c = make();
Expand Down