fix: generate valid toml when outputting nested structs (#936)

* chore: add regression test for #934

* fix: properly order nested toml tables

* chore: remove unnecessary `to_owned()`

Cargo.toml

@@ -43,7 +43,7 @@ dirs = "4"
 serde = { version = "1.0.136", features = ["derive"] }
 smol_str = "0.1.17"
 thiserror = "1.0.21"
-toml = "0.5.8"
+toml = "0.7.2"
 url = "2.2.0"
 wasm-bindgen = { version = "0.2.83", features = ["serde-serialize"] }
 wasm-bindgen-test = "0.3.33"

crates/nargo/tests/test_data/struct_inputs/Prover.toml

@@ -11,6 +11,8 @@ array = [0, 1]
 message = "helld"
 
 [a]
+baz = 0
+
 [a.bar_struct]
 val = "1"
 array = [0, 1]

crates/nargo/tests/test_data/struct_inputs/src/foo.nr

@@ -1,5 +1,6 @@
 mod bar;
 
 struct fooStruct {
-    bar_struct: bar::barStruct
+    bar_struct: bar::barStruct,
+    baz: Field,
 }

crates/noirc_abi/src/input_parser/toml.rs

@@ -30,18 +30,10 @@ pub(crate) fn parse_toml(
 pub(crate) fn serialize_to_toml(
     w_map: &BTreeMap<String, InputValue>,
 ) -> Result<String, InputParserError> {
-    // Toml requires that values be emitted before tables. Thus, we must reorder our map in case a TomlTypes::Table comes before any other values in the toml map
-    // BTreeMap orders by key and we need the name of the input as our key, so we must split our maps in case a table type has a name that is alphanumerically less
-    // than any other value type
-    let (tables_map, to_map): (BTreeMap<String, TomlTypes>, BTreeMap<String, TomlTypes>) = w_map
-        .iter()
-        .map(|(key, value)| (key.to_owned(), TomlTypes::from(value.clone())))
-        .partition(|(_, v)| matches!(v, TomlTypes::Table(_)));
-
-    let mut toml_string = toml::to_string(&to_map)?;
-    let toml_string_tables = toml::to_string(&tables_map)?;
-
-    toml_string.push_str(&toml_string_tables);
+    let to_map: BTreeMap<_, _> =
+        w_map.iter().map(|(key, value)| (key, TomlTypes::from(value.clone()))).collect();
+
+    let toml_string = toml::to_string(&to_map)?;
 
     Ok(toml_string)
 }