asya/toml-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maintain backward compatibility with Rust 1.15, take 3.

Browse source
This commit is contained in:
Azriel Hoh 2018-11-17 13:47:23 +13:00
parent 752bf0d4a1
commit cd6373a9ab
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/de.rs
View file

@ -568,7 +568,8 @@ impl<'de> de::Deserializer<'de> for ValueDeserializer<'de> {
match &self.value.e { match &self.value.e {
&E::InlineTable(ref values) | &E::DottedTable(ref values) => { &E::InlineTable(ref values) | &E::DottedTable(ref values) => {
let extra_fields = values.iter() let extra_fields = values.iter()
.filter_map(|(ref key, ref _val)| { .filter_map(|key_value| {
let (ref key, ref _val) = *key_value;
if !fields.contains(&&(**key)) { if !fields.contains(&&(**key)) {
Some(key.clone()) Some(key.clone())
} else { } else {

11
tests/enum_external_deserialize.rs
View file

@ -22,8 +22,7 @@ struct Multi {
#[test] #[test]
fn invalid_variant_returns_error_with_good_message_string() { fn invalid_variant_returns_error_with_good_message_string() {
let error = toml::from_str::<TheEnum>("\"NonExistent\"") let error = toml::from_str::<TheEnum>("\"NonExistent\"").unwrap_err();
.expect_err("Expected deserialization to fail.");
assert_eq!( assert_eq!(
error.to_string(), error.to_string(),
@ -33,8 +32,7 @@ fn invalid_variant_returns_error_with_good_message_string() {
#[test] #[test]
fn invalid_variant_returns_error_with_good_message_inline_table() { fn invalid_variant_returns_error_with_good_message_inline_table() {
let error = toml::from_str::<TheEnum>("{ NonExistent = {} }") let error = toml::from_str::<TheEnum>("{ NonExistent = {} }").unwrap_err();
.expect_err("Expected deserialization to fail.");
assert_eq!( assert_eq!(
error.to_string(), error.to_string(),
"unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`" "unknown variant `NonExistent`, expected one of `Plain`, `Tuple`, `NewType`, `Struct`"
@ -43,8 +41,7 @@ fn invalid_variant_returns_error_with_good_message_inline_table() {
#[test] #[test]
fn extra_field_returns_expected_empty_table_error() { fn extra_field_returns_expected_empty_table_error() {
let error = toml::from_str::<TheEnum>("{ Plain = { extra_field = 404 } }") let error = toml::from_str::<TheEnum>("{ Plain = { extra_field = 404 } }").unwrap_err();
.expect_err("Expected deserialization to fail.");
assert_eq!(error.to_string(), "expected empty table"); assert_eq!(error.to_string(), "expected empty table");
} }
@ -52,7 +49,7 @@ fn extra_field_returns_expected_empty_table_error() {
#[test] #[test]
fn extra_field_returns_expected_empty_table_error_struct_variant() { fn extra_field_returns_expected_empty_table_error_struct_variant() {
let error = toml::from_str::<TheEnum>("{ Struct = { value = 123, extra_0 = 0, extra_1 = 1 } }") let error = toml::from_str::<TheEnum>("{ Struct = { value = 123, extra_0 = 0, extra_1 = 1 } }")
.expect_err("Expected deserialization to fail."); .unwrap_err();
assert_eq!( assert_eq!(
error.to_string(), error.to_string(),