mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-09-15 19:36:16 +00:00
nl: implement Default for Settings
This commit is contained in:
parent
e5808b7816
commit
c32139784a
1 changed files with 19 additions and 14 deletions
|
@ -42,6 +42,24 @@ pub struct Settings {
|
||||||
number_separator: String,
|
number_separator: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Settings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
header_numbering: NumberingStyle::NumberForNone,
|
||||||
|
body_numbering: NumberingStyle::NumberForAll,
|
||||||
|
footer_numbering: NumberingStyle::NumberForNone,
|
||||||
|
section_delimiter: ['\\', ':'],
|
||||||
|
starting_line_number: 1,
|
||||||
|
line_increment: 1,
|
||||||
|
join_blank_lines: 1,
|
||||||
|
number_width: 6,
|
||||||
|
number_format: NumberFormat::Right,
|
||||||
|
renumber: true,
|
||||||
|
number_separator: String::from("\t"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// NumberingStyle stores which lines are to be numbered.
|
// NumberingStyle stores which lines are to be numbered.
|
||||||
// The possible options are:
|
// The possible options are:
|
||||||
// 1. Number all lines
|
// 1. Number all lines
|
||||||
|
@ -87,20 +105,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||||
|
|
||||||
let matches = uu_app().try_get_matches_from(args)?;
|
let matches = uu_app().try_get_matches_from(args)?;
|
||||||
|
|
||||||
// A mutable settings object, initialized with the defaults.
|
let mut settings = Settings::default();
|
||||||
let mut settings = Settings {
|
|
||||||
header_numbering: NumberingStyle::NumberForNone,
|
|
||||||
body_numbering: NumberingStyle::NumberForAll,
|
|
||||||
footer_numbering: NumberingStyle::NumberForNone,
|
|
||||||
section_delimiter: ['\\', ':'],
|
|
||||||
starting_line_number: 1,
|
|
||||||
line_increment: 1,
|
|
||||||
join_blank_lines: 1,
|
|
||||||
number_width: 6,
|
|
||||||
number_format: NumberFormat::Right,
|
|
||||||
renumber: true,
|
|
||||||
number_separator: String::from("\t"),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Update the settings from the command line options, and terminate the
|
// Update the settings from the command line options, and terminate the
|
||||||
// program if some options could not successfully be parsed.
|
// program if some options could not successfully be parsed.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue