Support TOML 1.1 (#20)

wolfv · web-flow · commit e61ad554bc02 · 2026-02-06T10:07:42.000+01:00
diff --git a/integ-tests/tests/parser.rs b/integ-tests/tests/parser.rs
@@ -140,10 +140,9 @@ invalid!(eof, "key =");
 mod bad_inline_tables {
     use super::invalid;
 
-    invalid!(trailing_comma, "a = {a=1,}");
+    // TOML 1.1: trailing_comma and newline are now valid, so removed from invalid tests
     invalid!(only_comma, "a = {,}");
     invalid!(duplicate_key, "a = {a=1,a=1}");
-    invalid!(newline, "a = {\n}");
     invalid!(eof, "a = {");
 }
 
@@ -307,3 +306,58 @@ mod require_newlines {
     invalid!(basic2, "0=0r0=0r=false");
     invalid!(basic3, "0=0r0=0r=falsefal=false");
 }
+
+// TOML 1.1 features
+mod toml_1_1 {
+    use super::valid;
+
+    // Inline tables can now have newlines
+    valid!(
+        inline_table_newlines,
+        r#"
+tbl = {
+    key = "value",
+    nested = {
+        inner = 42,
+    },
+}
+"#
+    );
+
+    // Trailing commas in inline tables
+    valid!(inline_table_trailing_comma, "a = {a=1,}");
+
+    // Empty inline table with newlines
+    valid!(inline_table_empty_newlines, "a = {\n}");
+
+    // \e escape sequence (escape character U+001B)
+    valid!(escape_e, r#"csi = "\e[""#);
+
+    // \xHH escape sequence for codepoints < 255
+    valid!(
+        escape_x,
+        r#"
+null = "\x00"
+letter = "\x61"
+"#
+    );
+
+    // Combined escape sequences
+    valid!(
+        escape_combined,
+        r#"test = "\x00\x1b\e\x61\u0041\U00000042""#
+    );
+
+    // Complex inline table with comments
+    valid!(
+        inline_table_with_comments,
+        r#"
+tbl = {
+    # This is a comment
+    key = "value",
+    # Another comment
+    num = 123,
+}
+"#
+    );
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__escape_combined-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__escape_combined-2.snap
@@ -0,0 +1,15 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[string]: root_test
+  ┌─ escape_combined:1:9
+  │
+1 │ test = "\x00\x1b\e\x61\u0041\U00000042"
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+note[table]: root
+  ┌─ escape_combined:1:1
+  │
+1 │ test = "\x00\x1b\e\x61\u0041\U00000042"
+  │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__escape_combined.snap b/integ-tests/tests/snapshots/parser__toml_1_1__escape_combined.snap
@@ -0,0 +1,7 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "test": "\u0000\u001b\u001baAB"
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__escape_e-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__escape_e-2.snap
@@ -0,0 +1,15 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[string]: root_csi
+  ┌─ escape_e:1:8
+  │
+1 │ csi = "\e["
+  │        ^^^
+
+note[table]: root
+  ┌─ escape_e:1:1
+  │
+1 │ csi = "\e["
+  │ ^^^^^^^^^^^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__escape_e.snap b/integ-tests/tests/snapshots/parser__toml_1_1__escape_e.snap
@@ -0,0 +1,7 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "csi": "\u001b["
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__escape_x-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__escape_x-2.snap
@@ -0,0 +1,24 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[string]: root_letter
+  ┌─ escape_x:3:11
+  │
+3 │ letter = "\x61"
+  │           ^^^^
+
+note[string]: root_null
+  ┌─ escape_x:2:9
+  │
+2 │ null = "\x00"
+  │         ^^^^
+
+note[table]: root
+  ┌─ escape_x:1:1
+  │  
+1 │ ╭ 
+2 │ │ null = "\x00"
+3 │ │ letter = "\x61"
+4 │ │ 
+  │ ╰^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__escape_x.snap b/integ-tests/tests/snapshots/parser__toml_1_1__escape_x.snap
@@ -0,0 +1,8 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "letter": "a",
+  "null": "\u0000"
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_empty_newlines-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_empty_newlines-2.snap
@@ -0,0 +1,18 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[table]: root_a
+  ┌─ inline_table_empty_newlines:1:5
+  │  
+1 │   a = {
+  │ ╭─────^
+2 │ │ }
+  │ ╰─^
+
+note[table]: root
+  ┌─ inline_table_empty_newlines:1:1
+  │  
+1 │ ╭ a = {
+2 │ │ }
+  │ ╰─^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_empty_newlines.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_empty_newlines.snap
@@ -0,0 +1,7 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "a": {}
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_newlines-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_newlines-2.snap
@@ -0,0 +1,48 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[string]: root_tbl_key
+  ┌─ inline_table_newlines:3:12
+  │
+3 │     key = "value",
+  │            ^^^^^
+
+note[integer]: root_tbl_nested_inner
+  ┌─ inline_table_newlines:5:17
+  │
+5 │         inner = 42,
+  │                 ^^
+
+note[table]: root_tbl_nested
+  ┌─ inline_table_newlines:4:14
+  │  
+4 │       nested = {
+  │ ╭──────────────^
+5 │ │         inner = 42,
+6 │ │     },
+  │ ╰─────^
+
+note[table]: root_tbl
+  ┌─ inline_table_newlines:2:7
+  │  
+2 │   tbl = {
+  │ ╭───────^
+3 │ │     key = "value",
+4 │ │     nested = {
+5 │ │         inner = 42,
+6 │ │     },
+7 │ │ }
+  │ ╰─^
+
+note[table]: root
+  ┌─ inline_table_newlines:1:1
+  │  
+1 │ ╭ 
+2 │ │ tbl = {
+3 │ │     key = "value",
+4 │ │     nested = {
+  · │
+7 │ │ }
+8 │ │ 
+  │ ╰^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_newlines.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_newlines.snap
@@ -0,0 +1,12 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "tbl": {
+    "key": "value",
+    "nested": {
+      "inner": 42
+    }
+  }
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_trailing_comma-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_trailing_comma-2.snap
@@ -0,0 +1,21 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[integer]: root_a_a
+  ┌─ inline_table_trailing_comma:1:8
+  │
+1 │ a = {a=1,}
+  │        ^
+
+note[table]: root_a
+  ┌─ inline_table_trailing_comma:1:5
+  │
+1 │ a = {a=1,}
+  │     ^^^^^^
+
+note[table]: root
+  ┌─ inline_table_trailing_comma:1:1
+  │
+1 │ a = {a=1,}
+  │ ^^^^^^^^^^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_trailing_comma.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_trailing_comma.snap
@@ -0,0 +1,9 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "a": {
+    "a": 1
+  }
+}
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_with_comments-2.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_with_comments-2.snap
@@ -0,0 +1,39 @@
+---
+source: integ-tests/tests/parser.rs
+expression: spans
+---
+note[string]: root_tbl_key
+  ┌─ inline_table_with_comments:4:12
+  │
+4 │     key = "value",
+  │            ^^^^^
+
+note[integer]: root_tbl_num
+  ┌─ inline_table_with_comments:6:11
+  │
+6 │     num = 123,
+  │           ^^^
+
+note[table]: root_tbl
+  ┌─ inline_table_with_comments:2:7
+  │  
+2 │   tbl = {
+  │ ╭───────^
+3 │ │     # This is a comment
+4 │ │     key = "value",
+5 │ │     # Another comment
+6 │ │     num = 123,
+7 │ │ }
+  │ ╰─^
+
+note[table]: root
+  ┌─ inline_table_with_comments:1:1
+  │  
+1 │ ╭ 
+2 │ │ tbl = {
+3 │ │     # This is a comment
+4 │ │     key = "value",
+  · │
+7 │ │ }
+8 │ │ 
+  │ ╰^
diff --git a/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_with_comments.snap b/integ-tests/tests/snapshots/parser__toml_1_1__inline_table_with_comments.snap
@@ -0,0 +1,10 @@
+---
+source: integ-tests/tests/parser.rs
+expression: valid_toml
+---
+{
+  "tbl": {
+    "key": "value",
+    "num": 123
+  }
+}
diff --git a/toml-span/src/de.rs b/toml-span/src/de.rs
@@ -776,24 +776,40 @@ impl<'a> Deserializer<'a> {
     // great to defer parsing everything until later.
     fn inline_table(&mut self) -> Result<(Span, TableValues<'a>), Error> {
         let mut ret = TableValues::default();
-        self.eat_whitespace();
+
+        // TOML 1.1: inline tables can span multiple lines and have trailing commas
+        let intermediate = |me: &mut Deserializer<'_>| -> Result<(), Error> {
+            loop {
+                me.eat_whitespace();
+                if !me.eat(Token::Newline)? && !me.eat_comment()? {
+                    break;
+                }
+            }
+            Ok(())
+        };
+
+        intermediate(self)?;
         if let Some(span) = self.eat_spanned(Token::RightBrace)? {
             return Ok((span, ret));
         }
         loop {
             let key = self.dotted_key()?;
-            self.eat_whitespace();
+            intermediate(self)?;
             self.expect(Token::Equals)?;
-            self.eat_whitespace();
+            intermediate(self)?;
             let value = self.value()?;
             self.add_dotted_key(key, value, &mut ret)?;
 
-            self.eat_whitespace();
+            intermediate(self)?;
             if let Some(span) = self.eat_spanned(Token::RightBrace)? {
                 return Ok((span, ret));
             }
             self.expect(Token::Comma)?;
-            self.eat_whitespace();
+            intermediate(self)?;
+            // TOML 1.1: trailing comma is allowed
+            if let Some(span) = self.eat_spanned(Token::RightBrace)? {
+                return Ok((span, ret));
+            }
         }
     }
 
diff --git a/toml-span/src/tokens.rs b/toml-span/src/tokens.rs
@@ -384,6 +384,7 @@ impl<'a> Tokenizer<'a> {
                     Some((_, 'n')) => val.push('\n'),
                     Some((_, 'r')) => val.push('\r'),
                     Some((_, 't')) => val.push('\t'),
+                    Some((_, 'e')) => val.push('\u{1b}'), // TOML 1.1: escape character
                     Some((i, c @ ('u' | 'U'))) => {
                         let c = if c == 'u' {
                             me.hex::<4>(start, i)
@@ -392,6 +393,10 @@ impl<'a> Tokenizer<'a> {
                         };
                         val.push(c?);
                     }
+                    Some((i, 'x')) => {
+                        // TOML 1.1: \xHH for codepoints < 255
+                        val.push(me.hex::<2>(start, i)?);
+                    }
                     Some((i, c @ (' ' | '\t' | '\n'))) if multi => {
                         if c != '\n' {
                             while let Some((_, ch)) = me.chars.clone().next() {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +---
 +source: integ-tests/tests/parser.rs
 +expression: valid_toml
 +---
 +{
 +  "a": {}
 +}