Touch up PR 2795

serde_derive/src/de.rs

@@ -3027,7 +3027,8 @@ fn effective_style(variant: &Variant) -> Style {
     }
 }
 
-/// True if there are fields that is not skipped and has a `#[serde(flatten)]` attribute.
+/// True if there is any field with a `#[serde(flatten)]` attribute, other than
+/// fields which are skipped.
 fn has_flatten(fields: &[Field]) -> bool {
     fields
         .iter()

serde_derive/src/ser.rs

@@ -294,7 +294,7 @@ fn serialize_struct(params: &Parameters, fields: &[Field], cattrs: &attr::Contai
         "too many fields in {}: {}, maximum supported count is {}",
         cattrs.name().serialize_name(),
         fields.len(),
-        u32::MAX
+        u32::MAX,
     );
 
     let has_non_skipped_flatten = fields