Skip to content

Commit 878110a

Browse files
committed
Simplify code after dead code elimination
1 parent 59ec8b7 commit 878110a

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

serde_derive/src/de.rs

+6-16
Original file line numberDiff line numberDiff line change
@@ -630,11 +630,10 @@ fn deserialize_tuple_in_place(
630630
}
631631
};
632632

633+
let type_name = cattrs.name().deserialize_name();
633634
let dispatch = if nfields == 1 {
634-
let type_name = cattrs.name().deserialize_name();
635635
quote!(_serde::Deserializer::deserialize_newtype_struct(__deserializer, #type_name, #visitor_expr))
636636
} else {
637-
let type_name = cattrs.name().deserialize_name();
638637
quote!(_serde::Deserializer::deserialize_tuple_struct(__deserializer, #type_name, #field_count, #visitor_expr))
639638
};
640639

@@ -1164,19 +1163,7 @@ fn deserialize_struct_in_place(
11641163
let field_names = field_names_idents
11651164
.iter()
11661165
.flat_map(|(_, _, aliases)| aliases);
1167-
1168-
let visitor_expr = quote! {
1169-
__Visitor {
1170-
place: __place,
1171-
lifetime: _serde::__private::PhantomData,
1172-
}
1173-
};
1174-
let dispatch = {
1175-
let type_name = cattrs.name().deserialize_name();
1176-
quote! {
1177-
_serde::Deserializer::deserialize_struct(__deserializer, #type_name, FIELDS, #visitor_expr)
1178-
}
1179-
};
1166+
let type_name = cattrs.name().deserialize_name();
11801167

11811168
let in_place_impl_generics = de_impl_generics.in_place();
11821169
let in_place_ty_generics = de_ty_generics.in_place();
@@ -1218,7 +1205,10 @@ fn deserialize_struct_in_place(
12181205
#[doc(hidden)]
12191206
const FIELDS: &'static [&'static str] = &[ #(#field_names),* ];
12201207

1221-
#dispatch
1208+
_serde::Deserializer::deserialize_struct(__deserializer, #type_name, FIELDS, __Visitor {
1209+
place: __place,
1210+
lifetime: _serde::__private::PhantomData,
1211+
})
12221212
})
12231213
}
12241214

0 commit comments

Comments
 (0)