Use proper fmt::DebugStruct facility in Debug impl

This commit is contained in:
CreepySkeleton 2020-05-23 20:00:17 +03:00
parent 8b37d579f8
commit a827ad5bd4

View file

@ -4439,49 +4439,48 @@ impl<'help> Eq for Arg<'help> {}
impl<'help> fmt::Debug for Arg<'help> { impl<'help> fmt::Debug for Arg<'help> {
fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
write!( f.debug_struct("Arg")
f, .field("id", &self.id)
"Arg {{ id: {:X?}, name: {:?}, help: {:?}, long_help: {:?}, conflicts_with: {:?}, \ .field("name", &self.name)
settings: {:?}, required_unless: {:?}, overrides_with: {:?}, groups: {:?}, \ .field("about", &self.about)
requires: {:?}, requires_ifs: {:?}, short: {:?}, index: {:?}, long: {:?}, \ .field("long_about", &self.long_about)
aliases: {:?}, short_aliases: {:?}, possible_values: {:?}, value_names: {:?}, \ .field("blacklist", &self.blacklist)
number_of_values: {:?}, max_values: {:?}, min_values: {:?}, value_delimiter: {:?}, \ .field("settings", &self.settings)
default_value_ifs: {:?}, value_terminator: {:?}, display_order: {:?}, env: {:?}, \ .field("overrides", &self.overrides)
unified_ord: {:?}, default_value: {:?}, validator: {}, validator_os: {}, \ .field("groups", &self.groups)
default_missing_value: {:?}, \ .field("requires", &self.requires)
}}", .field("r_ifs", &self.r_ifs)
self.id, .field("r_unless", &self.r_unless)
self.name, .field("short", &self.short)
self.about, .field("long", &self.long)
self.long_about, .field("aliases", &self.aliases)
self.blacklist, .field("short_aliases", &self.short_aliases)
self.settings, .field("disp_ord", &self.disp_ord)
self.r_unless, .field("unified_ord", &self.unified_ord)
self.overrides, .field("possible_vals", &self.possible_vals)
self.groups, .field("val_names", &self.val_names)
self.requires, .field("num_vals", &self.num_vals)
self.r_ifs, .field("max_vals", &self.max_vals)
self.short, .field("min_vals", &self.min_vals)
self.index, .field(
self.long, "validator",
self.aliases, &self.validator.as_ref().map_or("None", |_| "Some(Fn)"),
self.short_aliases, )
self.possible_vals, .field(
self.val_names, "validator_os",
self.num_vals, &self.validator_os.as_ref().map_or("None", |_| "Some(Fn)"),
self.max_vals, )
self.min_vals, .field("val_delim", &self.val_delim)
self.val_delim, .field("default_vals", &self.default_vals)
self.default_vals_ifs, .field("default_vals_ifs", &self.default_vals_ifs)
self.terminator, .field("env", &self.env)
self.disp_ord, .field("terminator", &self.terminator)
self.env, .field("index", &self.index)
self.unified_ord, .field("help_heading", &self.help_heading)
self.default_vals, .field("global", &self.global)
self.validator.as_ref().map_or("None", |_| "Some(Fn)"), .field("exclusive", &self.exclusive)
self.validator_os.as_ref().map_or("None", |_| "Some(Fn)"), .field("default_missing_vals", &self.default_missing_vals)
self.default_missing_vals .finish()
)
} }
} }