Merge support for TOML 1.1 output format

Author: ruuda

docs/changelog.md

@@ -18,6 +18,9 @@ compatibility impact will be clearly marked as such in the changelog.
 
 Unreleased.
 
+ * Add support for <abbr>TOML 1.1</abbr> as an output format. The existing
+   `toml` output format is now an alias for `toml-1.0`, so there is no change
+   in behavior for existing usage.
   * Fix a bug that prevented parsing nested functions.
 
 Thanks to matthieucx for contributing to this release.

docs/rcl_evaluate.md

@@ -45,7 +45,19 @@ Output in the given format. The following formats are supported:
   <dd>Output pretty-printed <abbr>RCL</abbr>.</dd>
 
   <dt>toml</dt>
-  <dd>Output <abbr>TOML</abbr>.</dd>
+  <dd>Alias for <code>toml-1.0</code>.</dd>
+
+  <dt>toml-1.0</dt>
+  <dd>Output <abbr>TOML 1.0</abbr>.
+  This version is the most widely supported,
+  but can be less readable because inline tables
+  cannot span multiple lines.</dd>
+
+  <dt>toml-1.1</dt>
+  <dd>Output <abbr>TOML 1.1</abbr>.
+  This version supports multi-line tables,
+  but it was only released in December 2025,
+  so it is less widely supported.</dd>
 
   <dt>yaml-stream</dt>
   <dd>If the document is a list, output every element as a <abbr>JSON</abbr>

fuzz/src/uber.rs

@@ -224,8 +224,9 @@ fn fuzz_eval_json_check(loader: &mut Loader, input: &str, cfg: pprint::Config) -
 ///
 /// Then check that the result can be parsed by the `toml` crate.
 fn fuzz_eval_toml_check(loader: &mut Loader, input: &str, cfg: pprint::Config) -> Result<()> {
+    use rcl::fmt_toml::{format_toml, TomlVersion};
     let (full_span, value) = eval(loader, input)?;
-    let toml_doc = rcl::fmt_toml::format_toml(full_span, &value)?;
+    let toml_doc = format_toml(TomlVersion::Toml10, full_span, &value)?;
     let toml_str = toml_doc.println(&cfg).to_string_no_markup();
     match toml::from_str::<toml::Value>(&toml_str[..]) {
         Ok(..) => Ok(()),

golden/run.py

@@ -126,8 +126,8 @@ def test_one(fname: str, fname_friendly: str, *, rewrite_output: bool) -> Option
         case "rcl":
             cmd = ["eval", "--format=rcl"]
 
-        case "toml":
-            cmd = ["eval", "--format=toml"]
+        case "toml_10":
+            cmd = ["eval", "--format=toml-1.0"]
             # For TOML, when the test case is not an error, we additionally test
             # that Python can parse the expected output, because there have been
             # some cases where RCL outputs something that other parsers reject.
@@ -137,6 +137,9 @@ def test_one(fname: str, fname_friendly: str, *, rewrite_output: bool) -> Option
                 except Exception as err:
                     raise Exception(f"Invalid TOML in {fname}") from err
 
+        case "toml_11":
+            cmd = ["eval", "--format=toml-1.1"]
+
         case "yaml_stream":
             cmd = ["eval", "--format=yaml-stream"]