Touch up PR 2567

Author: dtolnay

serde_derive/src/de.rs

@@ -1268,7 +1268,7 @@ fn prepare_enum_variant_enum(variants: &[Variant]) -> (TokenStream, Stmts) {
 
     let variant_visitor = Stmts(deserialize_generated_identifier(
         &variant_names_idents,
-        false, // variant identifiers does not depend on the presence of flatten fields
+        false, // variant identifiers do not depend on the presence of flatten fields
         true,
         None,
         fallthrough,
@@ -2708,7 +2708,7 @@ fn deserialize_map_in_place(
 ) -> Fragment {
     assert!(
         !cattrs.has_flatten(),
-        "inplace deserialization of maps doesn't support flatten fields"
+        "inplace deserialization of maps does not support flatten fields"
     );
 
     // Create the field names for the fields.

serde_derive/src/internals/attr.rs

@@ -216,9 +216,9 @@ pub struct Container {
     type_into: Option<syn::Type>,
     remote: Option<syn::Path>,
     identifier: Identifier,
-    /// `true` if container is a `struct` and it has a field with `#[serde(flatten)]`
-    /// attribute or it is an `enum` with a struct variant which has a field with
-    /// `#[serde(flatten)]` attribute. Examples:
+    /// True if container is a struct and has a field with `#[serde(flatten)]`,
+    /// or is an enum with a struct variant which has a field with
+    /// `#[serde(flatten)]`.
     ///
     /// ```ignore
     /// struct Container {
@@ -810,8 +810,8 @@ pub struct Variant {
     rename_all_rules: RenameAllRules,
     ser_bound: Option<Vec<syn::WherePredicate>>,
     de_bound: Option<Vec<syn::WherePredicate>>,
-    /// `true` if variant is a struct variant which contains a field with `#[serde(flatten)]`
-    /// attribute. Examples:
+    /// True if variant is a struct variant which contains a field with
+    /// `#[serde(flatten)]`.
     ///
     /// ```ignore
     /// enum Enum {

test_suite/tests/regression/issue1904.rs

@@ -1,4 +1,5 @@
 #![allow(dead_code)] // we do not read enum fields
+
 use serde_derive::Deserialize;
 
 #[derive(Deserialize)]

test_suite/tests/regression/issue2792.rs

@@ -1,4 +1,5 @@
 #![allow(dead_code)] // we do not read enum fields
+
 use serde_derive::Deserialize;
 
 #[derive(Deserialize)]
@@ -12,5 +13,6 @@ pub enum A {
         e: E,
     },
 }
+
 #[derive(Deserialize)]
 pub struct E {}