Merge pull request #460 from epage/compliance

fix(parser): Allow appending to dotted table

crates/toml/Cargo.toml

@@ -53,7 +53,7 @@ serde_spanned = { version = "0.5.0", path = "../serde_spanned", features = ["ser
 [dev-dependencies]
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"
-toml-test-harness = "0.4.2"
+toml-test-harness = "0.4.3"
 snapbox = "0.4.3"
 
 [[test]]

crates/toml/tests/decoder_compliance.rs

@@ -5,12 +5,18 @@ fn main() {
     let mut harness = toml_test_harness::DecoderHarness::new(decoder);
     harness
         .ignore([
-            "invalid/integer/positive-hex.toml",
-            "invalid/integer/positive-bin.toml",
-            "invalid/control/comment-del.toml",
             "invalid/control/comment-cr.toml",
-            "valid/string/escape-esc.toml",
+            "invalid/control/comment-del.toml",
             "invalid/datetime/hour-over.toml",
+            "invalid/integer/positive-bin.toml",
+            "invalid/integer/positive-hex.toml",
+            "valid/inline-table/newline.toml",
+            "valid/spec/float-0.toml",
+            "valid/spec/table-9.toml",
+            // Unreleased
+            "valid/string/escape-esc.toml",
+            "valid/string/hex-escape.toml",
+            "valid/datetime/no-seconds.toml",
         ])
         .unwrap();
     harness.test();

crates/toml/tests/encoder_compliance.rs

@@ -9,6 +9,8 @@ fn main() {
         .ignore([
             "valid/array/mixed-string-table.toml",
             "valid/inline-table/nest.toml",
+            "valid/spec/float-0.toml",
+            "valid/spec/array-0.toml",
         ])
         .unwrap();
     harness.test();

crates/toml_edit/Cargo.toml

@@ -57,8 +57,8 @@ serde_spanned = { version = "0.5.0", path = "../serde_spanned", features = ["ser
 
 [dev-dependencies]
 serde_json = "1.0.91"
-toml-test-harness = "0.4.2"
-toml-test-data = "1.2.0"
+toml-test-harness = "0.4.3"
+toml-test-data = "1.3.0"
 libtest-mimic = "0.6.0"
 snapbox = { version = "0.4.3", features = ["harness"] }
 

crates/toml_edit/src/parser/state.rs

@@ -242,12 +242,6 @@ impl ParseState {
                     // Since tables cannot be defined more than once, redefining such tables using a
                     // [table] header is not allowed. Likewise, using dotted keys to redefine tables
                     // already defined in [table] form is not allowed.
-                    if sweet_child_of_mine.is_dotted() && !dotted {
-                        return Err(CustomError::DuplicateKey {
-                            key: key.get().into(),
-                            table: None,
-                        });
-                    }
                     if dotted && !sweet_child_of_mine.is_implicit() {
                         return Err(CustomError::DuplicateKey {
                             key: key.get().into(),

crates/toml_edit/tests/decoder_compliance.rs

@@ -3,6 +3,15 @@ mod decoder;
 fn main() {
     let decoder = decoder::Decoder;
     let mut harness = toml_test_harness::DecoderHarness::new(decoder);
-    harness.ignore(["valid/string/escape-esc.toml"]).unwrap();
+    harness
+        .ignore([
+            "valid/spec/float-0.toml",
+            // Unreleased
+            "valid/string/escape-esc.toml",
+            "valid/string/hex-escape.toml",
+            "valid/datetime/no-seconds.toml",
+            "valid/inline-table/newline.toml",
+        ])
+        .unwrap();
     harness.test();
 }

crates/toml_edit/tests/easy_decoder_compliance.rs

@@ -5,7 +5,16 @@ mod easy_decoder;
 fn main() {
     let decoder = easy_decoder::Decoder;
     let mut harness = toml_test_harness::DecoderHarness::new(decoder);
-    harness.ignore(["valid/string/escape-esc.toml"]).unwrap();
+    harness
+        .ignore([
+            "valid/spec/float-0.toml",
+            // Unreleased
+            "valid/string/escape-esc.toml",
+            "valid/string/hex-escape.toml",
+            "valid/datetime/no-seconds.toml",
+            "valid/inline-table/newline.toml",
+        ])
+        .unwrap();
     harness.test();
 }
 

crates/toml_edit/tests/easy_encoder_compliance.rs

@@ -7,7 +7,8 @@ mod easy_encoder;
 fn main() {
     let encoder = easy_encoder::Encoder;
     let decoder = easy_decoder::Decoder;
-    let harness = toml_test_harness::EncoderHarness::new(encoder, decoder);
+    let mut harness = toml_test_harness::EncoderHarness::new(encoder, decoder);
+    harness.ignore(["valid/spec/float-0.toml"]).unwrap();
     harness.test();
 }
 

crates/toml_edit/tests/encoder_compliance.rs

@@ -4,6 +4,7 @@ mod encoder;
 fn main() {
     let encoder = encoder::Encoder;
     let decoder = decoder::Decoder;
-    let harness = toml_test_harness::EncoderHarness::new(encoder, decoder);
+    let mut harness = toml_test_harness::EncoderHarness::new(encoder, decoder);
+    harness.ignore(["valid/spec/float-0.toml"]).unwrap();
     harness.test();
 }

crates/toml_edit/tests/fixtures/invalid/encoding/bad-utf8-in-multiline-literal.stderr

@@ -0,0 +1 @@
+invalid utf-8 sequence of 1 bytes from index 66

crates/toml_edit/tests/fixtures/invalid/encoding/bad-utf8-in-multiline.stderr

@@ -0,0 +1 @@
+invalid utf-8 sequence of 1 bytes from index 66

crates/toml_edit/tests/fixtures/invalid/encoding/bad-utf8-in-string-literal.stderr

@@ -0,0 +1 @@
+invalid utf-8 sequence of 1 bytes from index 64

crates/toml_edit/tests/fixtures/invalid/spec/inline-table-2-0.stderr

@@ -0,0 +1,5 @@
+TOML parse error at line 3, column 1
+  |
+3 | type.edible = false  # INVALID
+  | ^
+dotted key `type` attempted to extend non-table type (inline table)

crates/toml_edit/tests/fixtures/invalid/spec/inline-table-3-0.stderr

@@ -0,0 +1,5 @@
+TOML parse error at line 3, column 1
+  |
+3 | type = { edible = false }  # INVALID
+  | ^
+duplicate key `type` in table `product`

crates/toml_edit/tests/fixtures/invalid/spec/key-value-pair-1.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 7
+  |
+1 | key = # INVALID
+  |       ^
+invalid string
+expected `"`, `'`

crates/toml_edit/tests/fixtures/invalid/spec/keys-2.stderr

@@ -0,0 +1,5 @@
+TOML parse error at line 1, column 1
+  |
+1 | = "no key name"  # INVALID
+  | ^
+invalid key

crates/toml_edit/tests/fixtures/invalid/spec/string-4-0.stderr

@@ -0,0 +1,5 @@
+TOML parse error at line 2, column 46
+  |
+2 | str5 = """Here are three quotation marks: """."""  # INVALID
+  |                                              ^
+expected newline, `#`

crates/toml_edit/tests/fixtures/invalid/spec/string-7-0.stderr

@@ -0,0 +1,5 @@
+TOML parse error at line 3, column 48
+  |
+3 | apos15 = '''Here are fifteen apostrophes: ''''''''''''''''''  # INVALID
+  |                                                ^
+expected newline, `#`

crates/toml_edit/tests/fixtures/invalid/spec/table-9-0.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 5, column 1
+  |
+5 | [fruit.apple]  # INVALID
+  | ^
+invalid table header
+duplicate key `apple` in table `fruit`

crates/toml_edit/tests/fixtures/invalid/spec/table-9-1.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 6, column 1
+  |
+6 | [fruit.apple.taste]  # INVALID
+  | ^
+invalid table header
+duplicate key `taste` in table `fruit.apple`

crates/toml_edit/tests/fixtures/invalid/string/bad-hex-esc-1.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 20
+  |
+1 | bad-hex-esc-1 = "\x0g"
+  |                    ^
+invalid escape sequence
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`

crates/toml_edit/tests/fixtures/invalid/string/bad-hex-esc-2.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 20
+  |
+1 | bad-hex-esc-2 = "\xG0"
+  |                    ^
+invalid escape sequence
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`

crates/toml_edit/tests/fixtures/invalid/string/bad-hex-esc-3.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 20
+  |
+1 | bad-hex-esc-3 = "\x"
+  |                    ^
+invalid escape sequence
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`

crates/toml_edit/tests/fixtures/invalid/string/bad-hex-esc-4.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 20
+  |
+1 | bad-hex-esc-4 = "\x 50"
+  |                    ^
+invalid escape sequence
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`

crates/toml_edit/tests/fixtures/invalid/string/bad-hex-esc-5.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 20
+  |
+1 | bad-hex-esc-5 = "\x 50"
+  |                    ^
+invalid escape sequence
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`

crates/toml_edit/tests/fixtures/invalid/string/bad-hex-esc.stderr

@@ -0,0 +1,6 @@
+TOML parse error at line 1, column 20
+  |
+1 | bad-hex-esc-1 = "\x0g"
+  |                    ^
+invalid escape sequence
+expected `b`, `f`, `n`, `r`, `t`, `u`, `U`, `\`, `"`

crates/toml_edit/tests/fixtures/invalid/table/duplicate-key-dotted-table2.stderr

@@ -3,4 +3,4 @@ TOML parse error at line 4, column 1
 4 | [fruit.apple.taste] # INVALID
   | ^
 invalid table header
-duplicate key `apple`
+duplicate key `taste` in table `fruit.apple`