Rebase with explicit_struct_names extension

ron-rs · Jan 15, 2024 · d5060c4 · d5060c4
1 parent b81e058
commit d5060c4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -187,7 +187,7 @@ While data structures with any of these attributes should generally roundtrip th
 
 - ron only supports string keys inside maps flattened into structs
 - internally (or adjacently) tagged or untagged enum variants or `#[serde(flatten)]`ed fields must not contain:
-  - struct names, e.g. by enabling the `PrettyConfig::struct_names` setting
+  - struct names, e.g. by enabling the `#[enable(explicit_struct_names)]` extension or the `PrettyConfig::struct_names` setting
   - newtypes
   - zero-length arrays / tuples / tuple structs / structs / tuple variants / struct variants
     - `Option`s with `#[enable(implicit_some)]` must not contain any of these or a unit, unit struct, or an untagged unit variant

diff --git a/fuzz/fuzz_targets/bench/lib.rs b/fuzz/fuzz_targets/bench/lib.rs
@@ -5152,7 +5152,12 @@ impl<'a> SerdeDataType<'a> {
                         // Flattened fields with maps must fulfil certain criteria
                         return Err(arbitrary::Error::IncorrectFormat);
                     }
-                    if *flatten && pretty.struct_names {
+                    if *flatten
+                        && (pretty.struct_names
+                            || pretty
+                                .extensions
+                                .contains(Extensions::EXPLICIT_STRUCT_NAMES))
+                    {
                         // BUG: struct names inside flattend structs do not roundtrip
                         return Err(arbitrary::Error::IncorrectFormat);
                     }
@@ -5171,7 +5176,7 @@ impl<'a> SerdeDataType<'a> {
                     representation,
                     SerdeEnumRepresentation::Untagged |
                     SerdeEnumRepresentation::InternallyTagged { tag: _ }
-                    if pretty.struct_names
+                    if pretty.struct_names || pretty.extensions.contains(Extensions::EXPLICIT_STRUCT_NAMES)
                 ) {
                     return Err(arbitrary::Error::IncorrectFormat);
                 }
@@ -5311,7 +5316,12 @@ impl<'a> SerdeDataType<'a> {
                                 // Flattened fields with maps must fulfil certain criteria
                                 return Err(arbitrary::Error::IncorrectFormat);
                             }
-                            if *flatten && pretty.struct_names {
+                            if *flatten
+                                && (pretty.struct_names
+                                    || pretty
+                                        .extensions
+                                        .contains(Extensions::EXPLICIT_STRUCT_NAMES))
+                            {
                                 // BUG: struct names inside flattend structs do not roundtrip
                                 return Err(arbitrary::Error::IncorrectFormat);
                             }