Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 15:22:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4747 from cakebaker/fmt_implement_default_for_fmtoptions

Browse source 
fmt: implement Default for FmtOptions
This commit is contained in:
Terts Diepraam 2023-08-11 15:48:43 +02:00 committed by GitHub
commit 84bfbb0e5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/uu/fmt/src/fmt.rs
View file

@ -60,25 +60,10 @@ pub struct FmtOptions {
goal: usize, goal: usize,
tabwidth: usize, tabwidth: usize,
} }
/// Parse the command line arguments and return the list of files and formatting options.
///
/// # Arguments
///
/// * `args` - Command line arguments.
///
/// # Returns
///
/// A tuple containing a vector of file names and a `FmtOptions` struct.
#[allow(clippy::cognitive_complexity)]
fn parse_arguments(args: impl uucore::Args) -> UResult<(Vec<String>, FmtOptions)> {
let matches = uu_app().try_get_matches_from(args)?;
let mut files: Vec<String> = matches impl Default for FmtOptions {
.get_many::<String>(ARG_FILES) fn default() -> Self {
.map(|v| v.map(ToString::to_string).collect()) Self {
.unwrap_or_default();
let mut fmt_opts = FmtOptions {
crown: false, crown: false,
tagged: false, tagged: false,
mail: false, mail: false,
@ -91,10 +76,36 @@ fn parse_arguments(args: impl uucore::Args) -> UResult<(Vec<String>, FmtOptions)
use_anti_prefix: false, use_anti_prefix: false,
anti_prefix: String::new(), anti_prefix: String::new(),
xanti_prefix: false, xanti_prefix: false,
width: 79, width: 75,
goal: 74, goal: 70,
tabwidth: 8, tabwidth: 8,
}; }
}
}
/// Parse the command line arguments and return the list of files and formatting options.
///
/// # Arguments
///
/// * `args` - Command line arguments.
///
/// # Returns
///
/// A tuple containing a vector of file names and a `FmtOptions` struct.
#[allow(clippy::cognitive_complexity)]
#[allow(clippy::field_reassign_with_default)]
fn parse_arguments(args: impl uucore::Args) -> UResult<(Vec<String>, FmtOptions)> {
// by default, goal is 93% of width
const DEFAULT_GOAL_TO_WIDTH_RATIO: usize = 93;
let matches = uu_app().try_get_matches_from(args)?;
let mut files: Vec<String> = matches
.get_many::<String>(ARG_FILES)
.map(|v| v.map(ToString::to_string).collect())
.unwrap_or_default();
let mut fmt_opts = FmtOptions::default();
fmt_opts.tagged = matches.get_flag(OPT_TAGGED_PARAGRAPH); fmt_opts.tagged = matches.get_flag(OPT_TAGGED_PARAGRAPH);
if matches.get_flag(OPT_CROWN_MARGIN) { if matches.get_flag(OPT_CROWN_MARGIN) {
@ -141,7 +152,10 @@ fn parse_arguments(args: impl uucore::Args) -> UResult<(Vec<String>, FmtOptions)
), ),
)); ));
} }
fmt_opts.goal = cmp::min(fmt_opts.width * 94 / 100, fmt_opts.width - 3); fmt_opts.goal = cmp::min(
fmt_opts.width * DEFAULT_GOAL_TO_WIDTH_RATIO / 100,
fmt_opts.width - 3,
);
}; };
if let Some(s) = matches.get_one::<String>(OPT_GOAL) { if let Some(s) = matches.get_one::<String>(OPT_GOAL) {
@ -155,7 +169,10 @@ fn parse_arguments(args: impl uucore::Args) -> UResult<(Vec<String>, FmtOptions)
} }
}; };
if !matches.get_flag(OPT_WIDTH) { if !matches.get_flag(OPT_WIDTH) {
fmt_opts.width = cmp::max(fmt_opts.goal * 100 / 94, fmt_opts.goal + 3); fmt_opts.width = cmp::max(
fmt_opts.goal * 100 / DEFAULT_GOAL_TO_WIDTH_RATIO,
fmt_opts.goal + 3,
);
} else if fmt_opts.goal > fmt_opts.width { } else if fmt_opts.goal > fmt_opts.width {
return Err(USimpleError::new(1, "GOAL cannot be greater than WIDTH.")); return Err(USimpleError::new(1, "GOAL cannot be greater than WIDTH."));
} }
@ -356,14 +373,14 @@ pub fn uu_app() -> Command {
Arg::new(OPT_WIDTH) Arg::new(OPT_WIDTH)
.short('w') .short('w')
.long("width") .long("width")
.help("Fill output lines up to a maximum of WIDTH columns, default 79.") .help("Fill output lines up to a maximum of WIDTH columns, default 75.")
.value_name("WIDTH"), .value_name("WIDTH"),
) )
.arg( .arg(
Arg::new(OPT_GOAL) Arg::new(OPT_GOAL)
.short('g') .short('g')
.long("goal") .long("goal")
.help("Goal width, default ~0.94*WIDTH. Must be less than WIDTH.") .help("Goal width, default of 93% of WIDTH. Must be less than WIDTH.")
.value_name("GOAL"), .value_name("GOAL"),
) )
.arg( .arg(