diff options
| author | Azriel Hoh <azriel91@gmail.com> | 2018-11-17 13:47:23 +1300 |
|---|---|---|
| committer | Azriel Hoh <azriel91@gmail.com> | 2018-11-17 14:19:14 +1300 |
| commit | df7ec3a4b66433118f09b12d5f32a10368a57852 (patch) | |
| tree | 9b182ffbe2c1e60f9787d160318ce5acee02deb3 /tests | |
| parent | 438157e662d2092dd49513a9791aa75788180c35 (diff) | |
| download | milf-rs-df7ec3a4b66433118f09b12d5f32a10368a57852.tar.gz milf-rs-df7ec3a4b66433118f09b12d5f32a10368a57852.zip | |
Maintain backward compatibility with Rust 1.15, take 3.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/enum_external_deserialize.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/enum_external_deserialize.rs b/tests/enum_external_deserialize.rs index e35f06a..3c38580 100644 --- a/tests/enum_external_deserialize.rs +++ b/tests/enum_external_deserialize.rs @@ -22,8 +22,7 @@ struct Multi { #[test] fn invalid_variant_returns_error_with_good_message_string() { - let error = toml::from_str::<TheEnum>("\"NonExistent\"") - .expect_err("Expected deserialization to fail."); + let error = toml::from_str::<TheEnum>("\"NonExistent\"").unwrap_err(); assert_eq!( error.to_string(), @@ -33,8 +32,7 @@ fn invalid_variant_returns_error_with_good_message_string() { #[test] fn invalid_variant_returns_error_with_good_message_inline_table() { - let error = toml::from_str::<TheEnum>("{ NonExistent = {} }") - .expect_err("Expected deserialization to fail."); + let error = toml::from_str::<TheEnum>("{ NonExistent = {} }").unwrap_err(); assert_eq!( error.to_string(), "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] fn extra_field_returns_expected_empty_table_error() { - let error = toml::from_str::<TheEnum>("{ Plain = { extra_field = 404 } }") - .expect_err("Expected deserialization to fail."); + let error = toml::from_str::<TheEnum>("{ Plain = { extra_field = 404 } }").unwrap_err(); assert_eq!(error.to_string(), "expected empty table"); } @@ -52,7 +49,7 @@ fn extra_field_returns_expected_empty_table_error() { #[test] 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 } }") - .expect_err("Expected deserialization to fail."); + .unwrap_err(); assert_eq!( error.to_string(), |