uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

fmt: inline parse_arguments function

Browse Source
This commit is contained in:
Terts Diepraam
2023-11-28 12:42:23 +01:00
parent 0b4d4b610c
commit 2a8f4ec294
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/fmt/src/fmt.rs
+8 -27
View File
@@ -147,32 +147,6 @@ impl FmtOptions {
}
}
/// 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.
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
.get_many::<String>(options::FILES)
.map(|v| v.map(ToString::to_string).collect())
.unwrap_or_default();
let fmt_opts = FmtOptions::from_matches(&matches)?;
if files.is_empty() {
files.push("-".to_owned());
}
Ok((files, fmt_opts))
}
/// Process the content of a file and format it according to the provided options.
///
/// # Arguments
@@ -226,7 +200,14 @@ fn process_file(
#[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let (files, fmt_opts) = parse_arguments(args)?;
let matches = uu_app().try_get_matches_from(args)?;
let files: Vec<String> = matches
.get_many::<String>(options::FILES)
.map(|v| v.map(ToString::to_string).collect())
.unwrap_or(vec!["-".into()]);
let fmt_opts = FmtOptions::from_matches(&matches)?;
let mut ostream = BufWriter::new(stdout());