From 6bbafa448922791d54ee253a7a725d4033071c3c Mon Sep 17 00:00:00 2001 From: est31 Date: Thu, 5 Sep 2019 15:38:54 +0200 Subject: Suppport deserialization of Spanned<> at the top level (#328) --- test-suite/tests/spanned.rs | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) (limited to 'test-suite/tests') diff --git a/test-suite/tests/spanned.rs b/test-suite/tests/spanned.rs index 5f6d5a2..5130a72 100644 --- a/test-suite/tests/spanned.rs +++ b/test-suite/tests/spanned.rs @@ -4,6 +4,7 @@ extern crate toml; extern crate serde_derive; use std::collections::HashMap; +use std::fmt::Debug; use toml::value::Datetime; use toml::Spanned; @@ -31,33 +32,56 @@ fn test_spanned_field() { foo: Spanned, } - fn good<'de, T>(s: &'de str, expected: &str) + #[derive(Deserialize)] + struct BareFoo { + foo: T, + } + + fn good<'de, T>(s: &'de str, expected: &str, end: Option) where - T: serde::Deserialize<'de>, + T: serde::Deserialize<'de> + Debug + PartialEq, { let foo: Foo = toml::from_str(s).unwrap(); assert_eq!(6, foo.foo.start()); - assert_eq!(s.len(), foo.foo.end()); + if let Some(end) = end { + assert_eq!(end, foo.foo.end()); + } else { + assert_eq!(s.len(), foo.foo.end()); + } assert_eq!(expected, &s[foo.foo.start()..foo.foo.end()]); + + // Test for Spanned<> at the top level + let foo_outer: Spanned> = toml::from_str(s).unwrap(); + + assert_eq!(0, foo_outer.start()); + assert_eq!(s.len(), foo_outer.end()); + assert_eq!(foo.foo.into_inner(), foo_outer.into_inner().foo); } - good::("foo = \"foo\"", "\"foo\""); - good::("foo = 42", "42"); + good::("foo = \"foo\"", "\"foo\"", None); + good::("foo = 42", "42", None); // leading plus - good::("foo = +42", "+42"); + good::("foo = +42", "+42", None); // table good::>( "foo = {\"foo\" = 42, \"bar\" = 42}", "{\"foo\" = 42, \"bar\" = 42}", + None, ); // array - good::>("foo = [0, 1, 2, 3, 4]", "[0, 1, 2, 3, 4]"); + good::>("foo = [0, 1, 2, 3, 4]", "[0, 1, 2, 3, 4]", None); // datetime - good::("foo = \"1997-09-09T09:09:09Z\"", "\"1997-09-09T09:09:09Z\""); + good::( + "foo = \"1997-09-09T09:09:09Z\"", + "\"1997-09-09T09:09:09Z\"", + None, + ); for expected in good_datetimes() { let s = format!("foo = {}", expected); - good::(&s, expected); + good::(&s, expected, None); } + // ending at something other than the absolute end + good::("foo = 42\nnoise = true", "42", Some(8)); } -- cgit v1.2.3