RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

expand: simplify signature of expand_shortcuts()

Browse source
This commit is contained in:
Daniel Hofstetter 2022-06-16 15:59:41 +02:00
parent 9cfb92df3f
commit 1655e85a13
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/uu/expand/src/expand.rs
View file

@ -14,7 +14,6 @@ extern crate uucore;
use clap::{crate_version, Arg, ArgMatches, Command}; use clap::{crate_version, Arg, ArgMatches, Command};
use std::error::Error; use std::error::Error;
use std::ffi::OsString;
use std::fmt; use std::fmt;
use std::fs::File; use std::fs::File;
use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write}; use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
@ -22,8 +21,8 @@ use std::num::IntErrorKind;
use std::str::from_utf8; use std::str::from_utf8;
use unicode_width::UnicodeWidthChar; use unicode_width::UnicodeWidthChar;
use uucore::display::Quotable; use uucore::display::Quotable;
use uucore::error::{FromIo, UError, UResult, UUsageError}; use uucore::error::{FromIo, UError, UResult};
use uucore::format_usage; use uucore::{format_usage, InvalidEncodingHandling};
static ABOUT: &str = "Convert tabs in each FILE to spaces, writing to standard output. static ABOUT: &str = "Convert tabs in each FILE to spaces, writing to standard output.
With no FILE, or when FILE is -, read standard input."; With no FILE, or when FILE is -, read standard input.";
@ -251,33 +250,30 @@ impl Options {
/// Preprocess command line arguments and expand shortcuts. For example, "-7" is expanded to /// Preprocess command line arguments and expand shortcuts. For example, "-7" is expanded to
/// "--tabs=7" and "-1,3" to "--tabs=1 --tabs=3". /// "--tabs=7" and "-1,3" to "--tabs=1 --tabs=3".
fn expand_shortcuts<'a>( fn expand_shortcuts(args: &[String]) -> Vec<String> {
mut args: impl uucore::Args + 'a, let mut processed_args = Vec::with_capacity(args.len());
) -> Result<Box<dyn Iterator<Item = OsString> + 'a>, Box<(dyn UError + 'static)>> {
// argv[0] is always present
let mut processed_args = vec![args.next().unwrap()];
for arg in args { for arg in args {
if let Some(s) = arg.to_str() { if arg.starts_with('-') && arg[1..].chars().all(is_digit_or_comma) {
if s.starts_with('-') && s[1..].chars().all(is_digit_or_comma) { arg[1..]
s[1..] .split(',')
.split(',') .filter(|s| !s.is_empty())
.filter(|s| !s.is_empty()) .for_each(|s| processed_args.push(format!("--tabs={}", s)));
.for_each(|s| processed_args.push(format!("--tabs={}", s).into()));
} else {
processed_args.push(arg);
}
} else { } else {
return Err(UUsageError::new(1, "bad argument encoding".to_owned())); processed_args.push(arg.to_string());
} }
} }
Ok(Box::new(processed_args.into_iter())) processed_args
} }
#[uucore::main] #[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let matches = uu_app().get_matches_from(expand_shortcuts(args)?); let args = args
.collect_str(InvalidEncodingHandling::Ignore)
.accept_any();
let matches = uu_app().get_matches_from(expand_shortcuts(&args));
expand(&Options::new(&matches)?).map_err_context(|| "failed to write output".to_string()) expand(&Options::new(&matches)?).map_err_context(|| "failed to write output".to_string())
} }