Refactor to use debug_struct
in several Debug impls
#44775
+42
−61
Merged