diff options
-rw-r--r-- | src/lib.rs | 2 | ||||
-rw-r--r-- | src/test/mod.rs | 2 | ||||
-rw-r--r-- | tests/README.md (renamed from src/test/README.md) | 0 | ||||
-rw-r--r-- | tests/invalid-encoder/array-mixed-types-ints-and-floats.json (renamed from src/test/invalid-encoder/array-mixed-types-ints-and-floats.json) | 0 | ||||
-rw-r--r-- | tests/invalid.rs (renamed from src/test/invalid.rs) | 4 | ||||
-rw-r--r-- | tests/invalid/array-mixed-types-arrays-and-ints.toml (renamed from src/test/invalid/array-mixed-types-arrays-and-ints.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/array-mixed-types-ints-and-floats.toml (renamed from src/test/invalid/array-mixed-types-ints-and-floats.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/array-mixed-types-strings-and-ints.toml (renamed from src/test/invalid/array-mixed-types-strings-and-ints.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/datetime-malformed-no-leads.toml (renamed from src/test/invalid/datetime-malformed-no-leads.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/datetime-malformed-no-secs.toml (renamed from src/test/invalid/datetime-malformed-no-secs.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/datetime-malformed-no-t.toml (renamed from src/test/invalid/datetime-malformed-no-t.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/datetime-malformed-no-z.toml (renamed from src/test/invalid/datetime-malformed-no-z.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/datetime-malformed-with-milli.toml (renamed from src/test/invalid/datetime-malformed-with-milli.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/duplicate-key-table.toml (renamed from src/test/invalid/duplicate-key-table.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/duplicate-keys.toml (renamed from src/test/invalid/duplicate-keys.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/duplicate-tables.toml (renamed from src/test/invalid/duplicate-tables.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/empty-implicit-table.toml (renamed from src/test/invalid/empty-implicit-table.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/empty-table.toml (renamed from src/test/invalid/empty-table.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/float-no-leading-zero.toml (renamed from src/test/invalid/float-no-leading-zero.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/float-no-trailing-digits.toml (renamed from src/test/invalid/float-no-trailing-digits.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/key-two-equals.toml (renamed from src/test/invalid/key-two-equals.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/string-bad-byte-escape.toml (renamed from src/test/invalid/string-bad-byte-escape.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/string-bad-escape.toml (renamed from src/test/invalid/string-bad-escape.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/string-byte-escapes.toml (renamed from src/test/invalid/string-byte-escapes.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/string-no-close.toml (renamed from src/test/invalid/string-no-close.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/table-array-implicit.toml (renamed from src/test/invalid/table-array-implicit.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/table-array-malformed-bracket.toml (renamed from src/test/invalid/table-array-malformed-bracket.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/table-array-malformed-empty.toml (renamed from src/test/invalid/table-array-malformed-empty.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/table-nested-brackets-close.toml (renamed from src/test/invalid/table-nested-brackets-close.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/table-nested-brackets-open.toml (renamed from src/test/invalid/table-nested-brackets-open.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/text-after-array-entries.toml (renamed from src/test/invalid/text-after-array-entries.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/text-after-integer.toml (renamed from src/test/invalid/text-after-integer.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/text-after-string.toml (renamed from src/test/invalid/text-after-string.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/text-after-table.toml (renamed from src/test/invalid/text-after-table.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/text-before-array-separator.toml (renamed from src/test/invalid/text-before-array-separator.toml) | 0 | ||||
-rw-r--r-- | tests/invalid/text-in-array.toml (renamed from src/test/invalid/text-in-array.toml) | 0 | ||||
-rw-r--r-- | tests/valid.rs (renamed from src/test/valid.rs) | 11 | ||||
-rw-r--r-- | tests/valid/array-empty.json (renamed from src/test/valid/array-empty.json) | 0 | ||||
-rw-r--r-- | tests/valid/array-empty.toml (renamed from src/test/valid/array-empty.toml) | 0 | ||||
-rw-r--r-- | tests/valid/array-nospaces.json (renamed from src/test/valid/array-nospaces.json) | 0 | ||||
-rw-r--r-- | tests/valid/array-nospaces.toml (renamed from src/test/valid/array-nospaces.toml) | 0 | ||||
-rw-r--r-- | tests/valid/arrays-hetergeneous.json (renamed from src/test/valid/arrays-hetergeneous.json) | 0 | ||||
-rw-r--r-- | tests/valid/arrays-hetergeneous.toml (renamed from src/test/valid/arrays-hetergeneous.toml) | 0 | ||||
-rw-r--r-- | tests/valid/arrays-nested.json (renamed from src/test/valid/arrays-nested.json) | 0 | ||||
-rw-r--r-- | tests/valid/arrays-nested.toml (renamed from src/test/valid/arrays-nested.toml) | 0 | ||||
-rw-r--r-- | tests/valid/arrays.json (renamed from src/test/valid/arrays.json) | 0 | ||||
-rw-r--r-- | tests/valid/arrays.toml (renamed from src/test/valid/arrays.toml) | 0 | ||||
-rw-r--r-- | tests/valid/bool.json (renamed from src/test/valid/bool.json) | 0 | ||||
-rw-r--r-- | tests/valid/bool.toml (renamed from src/test/valid/bool.toml) | 0 | ||||
-rw-r--r-- | tests/valid/comments-everywhere.json (renamed from src/test/valid/comments-everywhere.json) | 0 | ||||
-rw-r--r-- | tests/valid/comments-everywhere.toml (renamed from src/test/valid/comments-everywhere.toml) | 0 | ||||
-rw-r--r-- | tests/valid/datetime.json (renamed from src/test/valid/datetime.json) | 0 | ||||
-rw-r--r-- | tests/valid/datetime.toml (renamed from src/test/valid/datetime.toml) | 0 | ||||
-rw-r--r-- | tests/valid/empty.json (renamed from src/test/valid/empty.json) | 0 | ||||
-rw-r--r-- | tests/valid/empty.toml (renamed from src/test/valid/empty.toml) | 0 | ||||
-rw-r--r-- | tests/valid/example.json (renamed from src/test/valid/example.json) | 0 | ||||
-rw-r--r-- | tests/valid/example.toml (renamed from src/test/valid/example.toml) | 0 | ||||
-rw-r--r-- | tests/valid/float.json (renamed from src/test/valid/float.json) | 0 | ||||
-rw-r--r-- | tests/valid/float.toml (renamed from src/test/valid/float.toml) | 0 | ||||
-rw-r--r-- | tests/valid/implicit-and-explicit-after.json (renamed from src/test/valid/implicit-and-explicit-after.json) | 0 | ||||
-rw-r--r-- | tests/valid/implicit-and-explicit-after.toml (renamed from src/test/valid/implicit-and-explicit-after.toml) | 0 | ||||
-rw-r--r-- | tests/valid/implicit-and-explicit-before.json (renamed from src/test/valid/implicit-and-explicit-before.json) | 0 | ||||
-rw-r--r-- | tests/valid/implicit-and-explicit-before.toml (renamed from src/test/valid/implicit-and-explicit-before.toml) | 0 | ||||
-rw-r--r-- | tests/valid/implicit-groups.json (renamed from src/test/valid/implicit-groups.json) | 0 | ||||
-rw-r--r-- | tests/valid/implicit-groups.toml (renamed from src/test/valid/implicit-groups.toml) | 0 | ||||
-rw-r--r-- | tests/valid/integer.json (renamed from src/test/valid/integer.json) | 0 | ||||
-rw-r--r-- | tests/valid/integer.toml (renamed from src/test/valid/integer.toml) | 0 | ||||
-rw-r--r-- | tests/valid/key-equals-nospace.json (renamed from src/test/valid/key-equals-nospace.json) | 0 | ||||
-rw-r--r-- | tests/valid/key-equals-nospace.toml (renamed from src/test/valid/key-equals-nospace.toml) | 0 | ||||
-rw-r--r-- | tests/valid/key-special-chars.json (renamed from src/test/valid/key-special-chars.json) | 0 | ||||
-rw-r--r-- | tests/valid/key-special-chars.toml (renamed from src/test/valid/key-special-chars.toml) | 0 | ||||
-rw-r--r-- | tests/valid/key-with-pound.json (renamed from src/test/valid/key-with-pound.json) | 0 | ||||
-rw-r--r-- | tests/valid/key-with-pound.toml (renamed from src/test/valid/key-with-pound.toml) | 0 | ||||
-rw-r--r-- | tests/valid/long-float.json (renamed from src/test/valid/long-float.json) | 0 | ||||
-rw-r--r-- | tests/valid/long-float.toml (renamed from src/test/valid/long-float.toml) | 0 | ||||
-rw-r--r-- | tests/valid/long-integer.json (renamed from src/test/valid/long-integer.json) | 0 | ||||
-rw-r--r-- | tests/valid/long-integer.toml (renamed from src/test/valid/long-integer.toml) | 0 | ||||
-rw-r--r-- | tests/valid/string-empty.json (renamed from src/test/valid/string-empty.json) | 0 | ||||
-rw-r--r-- | tests/valid/string-empty.toml (renamed from src/test/valid/string-empty.toml) | 0 | ||||
-rw-r--r-- | tests/valid/string-escapes.json (renamed from src/test/valid/string-escapes.json) | 0 | ||||
-rw-r--r-- | tests/valid/string-escapes.toml (renamed from src/test/valid/string-escapes.toml) | 0 | ||||
-rw-r--r-- | tests/valid/string-simple.json (renamed from src/test/valid/string-simple.json) | 0 | ||||
-rw-r--r-- | tests/valid/string-simple.toml (renamed from src/test/valid/string-simple.toml) | 0 | ||||
-rw-r--r-- | tests/valid/string-with-pound.json (renamed from src/test/valid/string-with-pound.json) | 0 | ||||
-rw-r--r-- | tests/valid/string-with-pound.toml (renamed from src/test/valid/string-with-pound.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-implicit.json (renamed from src/test/valid/table-array-implicit.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-implicit.toml (renamed from src/test/valid/table-array-implicit.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-many.json (renamed from src/test/valid/table-array-many.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-many.toml (renamed from src/test/valid/table-array-many.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-nest.json (renamed from src/test/valid/table-array-nest.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-nest.toml (renamed from src/test/valid/table-array-nest.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-one.json (renamed from src/test/valid/table-array-one.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-array-one.toml (renamed from src/test/valid/table-array-one.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-empty.json (renamed from src/test/valid/table-empty.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-empty.toml (renamed from src/test/valid/table-empty.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-sub-empty.json (renamed from src/test/valid/table-sub-empty.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-sub-empty.toml (renamed from src/test/valid/table-sub-empty.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-whitespace.json (renamed from src/test/valid/table-whitespace.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-whitespace.toml (renamed from src/test/valid/table-whitespace.toml) | 0 | ||||
-rw-r--r-- | tests/valid/table-with-pound.json (renamed from src/test/valid/table-with-pound.json) | 0 | ||||
-rw-r--r-- | tests/valid/table-with-pound.toml (renamed from src/test/valid/table-with-pound.toml) | 0 | ||||
-rw-r--r-- | tests/valid/unicode-escape.json (renamed from src/test/valid/unicode-escape.json) | 0 | ||||
-rw-r--r-- | tests/valid/unicode-escape.toml (renamed from src/test/valid/unicode-escape.toml) | 0 | ||||
-rw-r--r-- | tests/valid/unicode-literal.json (renamed from src/test/valid/unicode-literal.json) | 0 | ||||
-rw-r--r-- | tests/valid/unicode-literal.toml (renamed from src/test/valid/unicode-literal.toml) | 0 |
105 files changed, 10 insertions, 9 deletions
@@ -60,7 +60,7 @@ pub use serialization::DecodeErrorKind::{ExpectedType, NilTooLong}; mod parser; mod show; mod serialization; -#[cfg(test)]mod test; + /// Representation of a TOML value. #[derive(PartialEq, Clone, Show)] #[allow(missing_docs)] diff --git a/src/test/mod.rs b/src/test/mod.rs deleted file mode 100644 index 6f2c7bd..0000000 --- a/src/test/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod valid; -mod invalid; diff --git a/src/test/README.md b/tests/README.md index ebbc01c..ebbc01c 100644 --- a/src/test/README.md +++ b/tests/README.md diff --git a/src/test/invalid-encoder/array-mixed-types-ints-and-floats.json b/tests/invalid-encoder/array-mixed-types-ints-and-floats.json index b7920a0..b7920a0 100644 --- a/src/test/invalid-encoder/array-mixed-types-ints-and-floats.json +++ b/tests/invalid-encoder/array-mixed-types-ints-and-floats.json diff --git a/src/test/invalid.rs b/tests/invalid.rs index 4f69ec6..582e25d 100644 --- a/src/test/invalid.rs +++ b/tests/invalid.rs @@ -1,4 +1,6 @@ -use {Parser}; +extern crate toml; + +use toml::{Parser}; fn run(toml: &str) { let mut p = Parser::new(toml); diff --git a/src/test/invalid/array-mixed-types-arrays-and-ints.toml b/tests/invalid/array-mixed-types-arrays-and-ints.toml index 051ec73..051ec73 100644 --- a/src/test/invalid/array-mixed-types-arrays-and-ints.toml +++ b/tests/invalid/array-mixed-types-arrays-and-ints.toml diff --git a/src/test/invalid/array-mixed-types-ints-and-floats.toml b/tests/invalid/array-mixed-types-ints-and-floats.toml index 51ebe80..51ebe80 100644 --- a/src/test/invalid/array-mixed-types-ints-and-floats.toml +++ b/tests/invalid/array-mixed-types-ints-and-floats.toml diff --git a/src/test/invalid/array-mixed-types-strings-and-ints.toml b/tests/invalid/array-mixed-types-strings-and-ints.toml index f348308..f348308 100644 --- a/src/test/invalid/array-mixed-types-strings-and-ints.toml +++ b/tests/invalid/array-mixed-types-strings-and-ints.toml diff --git a/src/test/invalid/datetime-malformed-no-leads.toml b/tests/invalid/datetime-malformed-no-leads.toml index 123f173..123f173 100644 --- a/src/test/invalid/datetime-malformed-no-leads.toml +++ b/tests/invalid/datetime-malformed-no-leads.toml diff --git a/src/test/invalid/datetime-malformed-no-secs.toml b/tests/invalid/datetime-malformed-no-secs.toml index ba93900..ba93900 100644 --- a/src/test/invalid/datetime-malformed-no-secs.toml +++ b/tests/invalid/datetime-malformed-no-secs.toml diff --git a/src/test/invalid/datetime-malformed-no-t.toml b/tests/invalid/datetime-malformed-no-t.toml index 617e3c5..617e3c5 100644 --- a/src/test/invalid/datetime-malformed-no-t.toml +++ b/tests/invalid/datetime-malformed-no-t.toml diff --git a/src/test/invalid/datetime-malformed-no-z.toml b/tests/invalid/datetime-malformed-no-z.toml index cf66b1e..cf66b1e 100644 --- a/src/test/invalid/datetime-malformed-no-z.toml +++ b/tests/invalid/datetime-malformed-no-z.toml diff --git a/src/test/invalid/datetime-malformed-with-milli.toml b/tests/invalid/datetime-malformed-with-milli.toml index eef792f..eef792f 100644 --- a/src/test/invalid/datetime-malformed-with-milli.toml +++ b/tests/invalid/datetime-malformed-with-milli.toml diff --git a/src/test/invalid/duplicate-key-table.toml b/tests/invalid/duplicate-key-table.toml index cedf05f..cedf05f 100644 --- a/src/test/invalid/duplicate-key-table.toml +++ b/tests/invalid/duplicate-key-table.toml diff --git a/src/test/invalid/duplicate-keys.toml b/tests/invalid/duplicate-keys.toml index 9b5aee0..9b5aee0 100644 --- a/src/test/invalid/duplicate-keys.toml +++ b/tests/invalid/duplicate-keys.toml diff --git a/src/test/invalid/duplicate-tables.toml b/tests/invalid/duplicate-tables.toml index 8ddf49b..8ddf49b 100644 --- a/src/test/invalid/duplicate-tables.toml +++ b/tests/invalid/duplicate-tables.toml diff --git a/src/test/invalid/empty-implicit-table.toml b/tests/invalid/empty-implicit-table.toml index 0cc36d0..0cc36d0 100644 --- a/src/test/invalid/empty-implicit-table.toml +++ b/tests/invalid/empty-implicit-table.toml diff --git a/src/test/invalid/empty-table.toml b/tests/invalid/empty-table.toml index fe51488..fe51488 100644 --- a/src/test/invalid/empty-table.toml +++ b/tests/invalid/empty-table.toml diff --git a/src/test/invalid/float-no-leading-zero.toml b/tests/invalid/float-no-leading-zero.toml index cab76bf..cab76bf 100644 --- a/src/test/invalid/float-no-leading-zero.toml +++ b/tests/invalid/float-no-leading-zero.toml diff --git a/src/test/invalid/float-no-trailing-digits.toml b/tests/invalid/float-no-trailing-digits.toml index cbff2d0..cbff2d0 100644 --- a/src/test/invalid/float-no-trailing-digits.toml +++ b/tests/invalid/float-no-trailing-digits.toml diff --git a/src/test/invalid/key-two-equals.toml b/tests/invalid/key-two-equals.toml index 25a0378..25a0378 100644 --- a/src/test/invalid/key-two-equals.toml +++ b/tests/invalid/key-two-equals.toml diff --git a/src/test/invalid/string-bad-byte-escape.toml b/tests/invalid/string-bad-byte-escape.toml index 4c7be59..4c7be59 100644 --- a/src/test/invalid/string-bad-byte-escape.toml +++ b/tests/invalid/string-bad-byte-escape.toml diff --git a/src/test/invalid/string-bad-escape.toml b/tests/invalid/string-bad-escape.toml index 60acb0c..60acb0c 100644 --- a/src/test/invalid/string-bad-escape.toml +++ b/tests/invalid/string-bad-escape.toml diff --git a/src/test/invalid/string-byte-escapes.toml b/tests/invalid/string-byte-escapes.toml index e94452a..e94452a 100644 --- a/src/test/invalid/string-byte-escapes.toml +++ b/tests/invalid/string-byte-escapes.toml diff --git a/src/test/invalid/string-no-close.toml b/tests/invalid/string-no-close.toml index 0c292fc..0c292fc 100644 --- a/src/test/invalid/string-no-close.toml +++ b/tests/invalid/string-no-close.toml diff --git a/src/test/invalid/table-array-implicit.toml b/tests/invalid/table-array-implicit.toml index 05f2507..05f2507 100644 --- a/src/test/invalid/table-array-implicit.toml +++ b/tests/invalid/table-array-implicit.toml diff --git a/src/test/invalid/table-array-malformed-bracket.toml b/tests/invalid/table-array-malformed-bracket.toml index 39c73b0..39c73b0 100644 --- a/src/test/invalid/table-array-malformed-bracket.toml +++ b/tests/invalid/table-array-malformed-bracket.toml diff --git a/src/test/invalid/table-array-malformed-empty.toml b/tests/invalid/table-array-malformed-empty.toml index a470ca3..a470ca3 100644 --- a/src/test/invalid/table-array-malformed-empty.toml +++ b/tests/invalid/table-array-malformed-empty.toml diff --git a/src/test/invalid/table-nested-brackets-close.toml b/tests/invalid/table-nested-brackets-close.toml index c8b5a67..c8b5a67 100644 --- a/src/test/invalid/table-nested-brackets-close.toml +++ b/tests/invalid/table-nested-brackets-close.toml diff --git a/src/test/invalid/table-nested-brackets-open.toml b/tests/invalid/table-nested-brackets-open.toml index 246d7e9..246d7e9 100644 --- a/src/test/invalid/table-nested-brackets-open.toml +++ b/tests/invalid/table-nested-brackets-open.toml diff --git a/src/test/invalid/text-after-array-entries.toml b/tests/invalid/text-after-array-entries.toml index 1a72890..1a72890 100644 --- a/src/test/invalid/text-after-array-entries.toml +++ b/tests/invalid/text-after-array-entries.toml diff --git a/src/test/invalid/text-after-integer.toml b/tests/invalid/text-after-integer.toml index 42de7af..42de7af 100644 --- a/src/test/invalid/text-after-integer.toml +++ b/tests/invalid/text-after-integer.toml diff --git a/src/test/invalid/text-after-string.toml b/tests/invalid/text-after-string.toml index c92a6f1..c92a6f1 100644 --- a/src/test/invalid/text-after-string.toml +++ b/tests/invalid/text-after-string.toml diff --git a/src/test/invalid/text-after-table.toml b/tests/invalid/text-after-table.toml index 87da9db..87da9db 100644 --- a/src/test/invalid/text-after-table.toml +++ b/tests/invalid/text-after-table.toml diff --git a/src/test/invalid/text-before-array-separator.toml b/tests/invalid/text-before-array-separator.toml index 9b06a39..9b06a39 100644 --- a/src/test/invalid/text-before-array-separator.toml +++ b/tests/invalid/text-before-array-separator.toml diff --git a/src/test/invalid/text-in-array.toml b/tests/invalid/text-in-array.toml index a6a6c42..a6a6c42 100644 --- a/src/test/invalid/text-in-array.toml +++ b/tests/invalid/text-in-array.toml diff --git a/src/test/valid.rs b/tests/valid.rs index 289fa24..6ff0d80 100644 --- a/src/test/valid.rs +++ b/tests/valid.rs @@ -1,11 +1,12 @@ -extern crate serialize; +extern crate "rustc-serialize" as rustc_serialize; +extern crate toml; use std::num::strconv; use std::collections::BTreeMap; -use self::serialize::json::{self, Json}; +use rustc_serialize::json::Json; -use {Parser, Value}; -use Value::{Table, Integer, Float, Boolean, Datetime, Array}; +use toml::{Parser, Value}; +use toml::Value::{Table, Integer, Float, Boolean, Datetime, Array}; fn to_json(toml: Value) -> Json { fn doit(s: &str, json: Json) -> Json { @@ -53,7 +54,7 @@ fn run(toml: &str, json: &str) { assert!(table.is_some()); let table = table.unwrap(); - let json = json::from_str(json).unwrap(); + let json = Json::from_str(json).unwrap(); let toml_json = to_json(Table(table)); assert!(json == toml_json, "expected\n{}\ngot\n{}\n", diff --git a/src/test/valid/array-empty.json b/tests/valid/array-empty.json index 2fbf256..2fbf256 100644 --- a/src/test/valid/array-empty.json +++ b/tests/valid/array-empty.json diff --git a/src/test/valid/array-empty.toml b/tests/valid/array-empty.toml index fa58dc6..fa58dc6 100644 --- a/src/test/valid/array-empty.toml +++ b/tests/valid/array-empty.toml diff --git a/src/test/valid/array-nospaces.json b/tests/valid/array-nospaces.json index 1833d61..1833d61 100644 --- a/src/test/valid/array-nospaces.json +++ b/tests/valid/array-nospaces.json diff --git a/src/test/valid/array-nospaces.toml b/tests/valid/array-nospaces.toml index 6618936..6618936 100644 --- a/src/test/valid/array-nospaces.toml +++ b/tests/valid/array-nospaces.toml diff --git a/src/test/valid/arrays-hetergeneous.json b/tests/valid/arrays-hetergeneous.json index e703739..e703739 100644 --- a/src/test/valid/arrays-hetergeneous.json +++ b/tests/valid/arrays-hetergeneous.json diff --git a/src/test/valid/arrays-hetergeneous.toml b/tests/valid/arrays-hetergeneous.toml index 91fcbdf..91fcbdf 100644 --- a/src/test/valid/arrays-hetergeneous.toml +++ b/tests/valid/arrays-hetergeneous.toml diff --git a/src/test/valid/arrays-nested.json b/tests/valid/arrays-nested.json index d21920c..d21920c 100644 --- a/src/test/valid/arrays-nested.json +++ b/tests/valid/arrays-nested.json diff --git a/src/test/valid/arrays-nested.toml b/tests/valid/arrays-nested.toml index ce33022..ce33022 100644 --- a/src/test/valid/arrays-nested.toml +++ b/tests/valid/arrays-nested.toml diff --git a/src/test/valid/arrays.json b/tests/valid/arrays.json index 4d16d8a..4d16d8a 100644 --- a/src/test/valid/arrays.json +++ b/tests/valid/arrays.json diff --git a/src/test/valid/arrays.toml b/tests/valid/arrays.toml index 6d6440d..6d6440d 100644 --- a/src/test/valid/arrays.toml +++ b/tests/valid/arrays.toml diff --git a/src/test/valid/bool.json b/tests/valid/bool.json index ae368e9..ae368e9 100644 --- a/src/test/valid/bool.json +++ b/tests/valid/bool.json diff --git a/src/test/valid/bool.toml b/tests/valid/bool.toml index a8a829b..a8a829b 100644 --- a/src/test/valid/bool.toml +++ b/tests/valid/bool.toml diff --git a/src/test/valid/comments-everywhere.json b/tests/valid/comments-everywhere.json index e69a2e9..e69a2e9 100644 --- a/src/test/valid/comments-everywhere.json +++ b/tests/valid/comments-everywhere.json diff --git a/src/test/valid/comments-everywhere.toml b/tests/valid/comments-everywhere.toml index 3dca74c..3dca74c 100644 --- a/src/test/valid/comments-everywhere.toml +++ b/tests/valid/comments-everywhere.toml diff --git a/src/test/valid/datetime.json b/tests/valid/datetime.json index 2ca93ce..2ca93ce 100644 --- a/src/test/valid/datetime.json +++ b/tests/valid/datetime.json diff --git a/src/test/valid/datetime.toml b/tests/valid/datetime.toml index 2e99340..2e99340 100644 --- a/src/test/valid/datetime.toml +++ b/tests/valid/datetime.toml diff --git a/src/test/valid/empty.json b/tests/valid/empty.json index 0967ef4..0967ef4 100644 --- a/src/test/valid/empty.json +++ b/tests/valid/empty.json diff --git a/src/test/valid/empty.toml b/tests/valid/empty.toml index e69de29..e69de29 100644 --- a/src/test/valid/empty.toml +++ b/tests/valid/empty.toml diff --git a/src/test/valid/example.json b/tests/valid/example.json index 48aa907..48aa907 100644 --- a/src/test/valid/example.json +++ b/tests/valid/example.json diff --git a/src/test/valid/example.toml b/tests/valid/example.toml index 8cb02e0..8cb02e0 100644 --- a/src/test/valid/example.toml +++ b/tests/valid/example.toml diff --git a/src/test/valid/float.json b/tests/valid/float.json index b8a2e97..b8a2e97 100644 --- a/src/test/valid/float.json +++ b/tests/valid/float.json diff --git a/src/test/valid/float.toml b/tests/valid/float.toml index 7c528d2..7c528d2 100644 --- a/src/test/valid/float.toml +++ b/tests/valid/float.toml diff --git a/src/test/valid/implicit-and-explicit-after.json b/tests/valid/implicit-and-explicit-after.json index 374bd09..374bd09 100644 --- a/src/test/valid/implicit-and-explicit-after.json +++ b/tests/valid/implicit-and-explicit-after.json diff --git a/src/test/valid/implicit-and-explicit-after.toml b/tests/valid/implicit-and-explicit-after.toml index c0e8865..c0e8865 100644 --- a/src/test/valid/implicit-and-explicit-after.toml +++ b/tests/valid/implicit-and-explicit-after.toml diff --git a/src/test/valid/implicit-and-explicit-before.json b/tests/valid/implicit-and-explicit-before.json index 374bd09..374bd09 100644 --- a/src/test/valid/implicit-and-explicit-before.json +++ b/tests/valid/implicit-and-explicit-before.json diff --git a/src/test/valid/implicit-and-explicit-before.toml b/tests/valid/implicit-and-explicit-before.toml index eee68ff..eee68ff 100644 --- a/src/test/valid/implicit-and-explicit-before.toml +++ b/tests/valid/implicit-and-explicit-before.toml diff --git a/src/test/valid/implicit-groups.json b/tests/valid/implicit-groups.json index fbae7fc..fbae7fc 100644 --- a/src/test/valid/implicit-groups.json +++ b/tests/valid/implicit-groups.json diff --git a/src/test/valid/implicit-groups.toml b/tests/valid/implicit-groups.toml index b6333e4..b6333e4 100644 --- a/src/test/valid/implicit-groups.toml +++ b/tests/valid/implicit-groups.toml diff --git a/src/test/valid/integer.json b/tests/valid/integer.json index 61985a1..61985a1 100644 --- a/src/test/valid/integer.json +++ b/tests/valid/integer.json diff --git a/src/test/valid/integer.toml b/tests/valid/integer.toml index c4f6297..c4f6297 100644 --- a/src/test/valid/integer.toml +++ b/tests/valid/integer.toml diff --git a/src/test/valid/key-equals-nospace.json b/tests/valid/key-equals-nospace.json index 1f8709a..1f8709a 100644 --- a/src/test/valid/key-equals-nospace.json +++ b/tests/valid/key-equals-nospace.json diff --git a/src/test/valid/key-equals-nospace.toml b/tests/valid/key-equals-nospace.toml index 560901c..560901c 100644 --- a/src/test/valid/key-equals-nospace.toml +++ b/tests/valid/key-equals-nospace.toml diff --git a/src/test/valid/key-special-chars.json b/tests/valid/key-special-chars.json index 6550ebd..6550ebd 100644 --- a/src/test/valid/key-special-chars.json +++ b/tests/valid/key-special-chars.json diff --git a/src/test/valid/key-special-chars.toml b/tests/valid/key-special-chars.toml index 8b3fc51..8b3fc51 100644 --- a/src/test/valid/key-special-chars.toml +++ b/tests/valid/key-special-chars.toml diff --git a/src/test/valid/key-with-pound.json b/tests/valid/key-with-pound.json index ee39e1d..ee39e1d 100644 --- a/src/test/valid/key-with-pound.json +++ b/tests/valid/key-with-pound.json diff --git a/src/test/valid/key-with-pound.toml b/tests/valid/key-with-pound.toml index 1c54f53..1c54f53 100644 --- a/src/test/valid/key-with-pound.toml +++ b/tests/valid/key-with-pound.toml diff --git a/src/test/valid/long-float.json b/tests/valid/long-float.json index 8ceed47..8ceed47 100644 --- a/src/test/valid/long-float.json +++ b/tests/valid/long-float.json diff --git a/src/test/valid/long-float.toml b/tests/valid/long-float.toml index 9558ae4..9558ae4 100644 --- a/src/test/valid/long-float.toml +++ b/tests/valid/long-float.toml diff --git a/src/test/valid/long-integer.json b/tests/valid/long-integer.json index 16c331e..16c331e 100644 --- a/src/test/valid/long-integer.json +++ b/tests/valid/long-integer.json diff --git a/src/test/valid/long-integer.toml b/tests/valid/long-integer.toml index 424a13a..424a13a 100644 --- a/src/test/valid/long-integer.toml +++ b/tests/valid/long-integer.toml diff --git a/src/test/valid/string-empty.json b/tests/valid/string-empty.json index 6c26d69..6c26d69 100644 --- a/src/test/valid/string-empty.json +++ b/tests/valid/string-empty.json diff --git a/src/test/valid/string-empty.toml b/tests/valid/string-empty.toml index e37e681..e37e681 100644 --- a/src/test/valid/string-empty.toml +++ b/tests/valid/string-empty.toml diff --git a/src/test/valid/string-escapes.json b/tests/valid/string-escapes.json index ca71d30..ca71d30 100644 --- a/src/test/valid/string-escapes.json +++ b/tests/valid/string-escapes.json diff --git a/src/test/valid/string-escapes.toml b/tests/valid/string-escapes.toml index 2d64500..2d64500 100644 --- a/src/test/valid/string-escapes.toml +++ b/tests/valid/string-escapes.toml diff --git a/src/test/valid/string-simple.json b/tests/valid/string-simple.json index 2e05f99..2e05f99 100644 --- a/src/test/valid/string-simple.json +++ b/tests/valid/string-simple.json diff --git a/src/test/valid/string-simple.toml b/tests/valid/string-simple.toml index e17ade6..e17ade6 100644 --- a/src/test/valid/string-simple.toml +++ b/tests/valid/string-simple.toml diff --git a/src/test/valid/string-with-pound.json b/tests/valid/string-with-pound.json index 33cdc9c..33cdc9c 100644 --- a/src/test/valid/string-with-pound.json +++ b/tests/valid/string-with-pound.json diff --git a/src/test/valid/string-with-pound.toml b/tests/valid/string-with-pound.toml index 5fd8746..5fd8746 100644 --- a/src/test/valid/string-with-pound.toml +++ b/tests/valid/string-with-pound.toml diff --git a/src/test/valid/table-array-implicit.json b/tests/valid/table-array-implicit.json index 32e4640..32e4640 100644 --- a/src/test/valid/table-array-implicit.json +++ b/tests/valid/table-array-implicit.json diff --git a/src/test/valid/table-array-implicit.toml b/tests/valid/table-array-implicit.toml index 3157ac9..3157ac9 100644 --- a/src/test/valid/table-array-implicit.toml +++ b/tests/valid/table-array-implicit.toml diff --git a/src/test/valid/table-array-many.json b/tests/valid/table-array-many.json index 84df2da..84df2da 100644 --- a/src/test/valid/table-array-many.json +++ b/tests/valid/table-array-many.json diff --git a/src/test/valid/table-array-many.toml b/tests/valid/table-array-many.toml index 46062be..46062be 100644 --- a/src/test/valid/table-array-many.toml +++ b/tests/valid/table-array-many.toml diff --git a/src/test/valid/table-array-nest.json b/tests/valid/table-array-nest.json index c117afa..c117afa 100644 --- a/src/test/valid/table-array-nest.json +++ b/tests/valid/table-array-nest.json diff --git a/src/test/valid/table-array-nest.toml b/tests/valid/table-array-nest.toml index d659a3d..d659a3d 100644 --- a/src/test/valid/table-array-nest.toml +++ b/tests/valid/table-array-nest.toml diff --git a/src/test/valid/table-array-one.json b/tests/valid/table-array-one.json index d75faae..d75faae 100644 --- a/src/test/valid/table-array-one.json +++ b/tests/valid/table-array-one.json diff --git a/src/test/valid/table-array-one.toml b/tests/valid/table-array-one.toml index cd7e1b6..cd7e1b6 100644 --- a/src/test/valid/table-array-one.toml +++ b/tests/valid/table-array-one.toml diff --git a/src/test/valid/table-empty.json b/tests/valid/table-empty.json index 6f3873a..6f3873a 100644 --- a/src/test/valid/table-empty.json +++ b/tests/valid/table-empty.json diff --git a/src/test/valid/table-empty.toml b/tests/valid/table-empty.toml index 8bb6a0a..8bb6a0a 100644 --- a/src/test/valid/table-empty.toml +++ b/tests/valid/table-empty.toml diff --git a/src/test/valid/table-sub-empty.json b/tests/valid/table-sub-empty.json index 9787770..9787770 100644 --- a/src/test/valid/table-sub-empty.json +++ b/tests/valid/table-sub-empty.json diff --git a/src/test/valid/table-sub-empty.toml b/tests/valid/table-sub-empty.toml index 70b7fe1..70b7fe1 100644 --- a/src/test/valid/table-sub-empty.toml +++ b/tests/valid/table-sub-empty.toml diff --git a/src/test/valid/table-whitespace.json b/tests/valid/table-whitespace.json index 3a73ec8..3a73ec8 100644 --- a/src/test/valid/table-whitespace.json +++ b/tests/valid/table-whitespace.json diff --git a/src/test/valid/table-whitespace.toml b/tests/valid/table-whitespace.toml index 798756c..798756c 100644 --- a/src/test/valid/table-whitespace.toml +++ b/tests/valid/table-whitespace.toml diff --git a/src/test/valid/table-with-pound.json b/tests/valid/table-with-pound.json index 5e594e4..5e594e4 100644 --- a/src/test/valid/table-with-pound.json +++ b/tests/valid/table-with-pound.json diff --git a/src/test/valid/table-with-pound.toml b/tests/valid/table-with-pound.toml index e7b777e..e7b777e 100644 --- a/src/test/valid/table-with-pound.toml +++ b/tests/valid/table-with-pound.toml diff --git a/src/test/valid/unicode-escape.json b/tests/valid/unicode-escape.json index deda62c..deda62c 100644 --- a/src/test/valid/unicode-escape.json +++ b/tests/valid/unicode-escape.json diff --git a/src/test/valid/unicode-escape.toml b/tests/valid/unicode-escape.toml index 057ce15..057ce15 100644 --- a/src/test/valid/unicode-escape.toml +++ b/tests/valid/unicode-escape.toml diff --git a/src/test/valid/unicode-literal.json b/tests/valid/unicode-literal.json index 00aa2f8..00aa2f8 100644 --- a/src/test/valid/unicode-literal.json +++ b/tests/valid/unicode-literal.json diff --git a/src/test/valid/unicode-literal.toml b/tests/valid/unicode-literal.toml index c65723c..c65723c 100644 --- a/src/test/valid/unicode-literal.toml +++ b/tests/valid/unicode-literal.toml |