1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-03 06:27:45 +00:00

refactor/sort ~ polish spelling (comments, names, and exceptions)

This commit is contained in:
Roy Ivy III 2021-05-30 18:36:19 -05:00
parent a15f8af99f
commit f8e04c562b
2 changed files with 9 additions and 6 deletions

View file

@ -1,5 +1,7 @@
# Benchmarking sort # Benchmarking sort
<!-- spell-checker:ignore (words) kbytes -->
Most of the time when sorting is spent comparing lines. The comparison functions however differ based Most of the time when sorting is spent comparing lines. The comparison functions however differ based
on which arguments are passed to `sort`, therefore it is important to always benchmark multiple scenarios. on which arguments are passed to `sort`, therefore it is important to always benchmark multiple scenarios.
This is an overview over what was benchmarked, and if you make changes to `sort`, you are encouraged to check This is an overview over what was benchmarked, and if you make changes to `sort`, you are encouraged to check
@ -96,7 +98,7 @@ When invoked with -c, we simply check if the input is already ordered. The input
Try to run the above benchmarks by piping the input through stdin (standard input) and redirect the Try to run the above benchmarks by piping the input through stdin (standard input) and redirect the
output through stdout (standard output): output through stdout (standard output):
- Remove the input file from the arguments and add `cat [inputfile] | ` at the beginning. - Remove the input file from the arguments and add `cat [input_file] | ` at the beginning.
- Remove `-o output.txt` and add `> output.txt` at the end. - Remove `-o output.txt` and add `> output.txt` at the end.
Example: `hyperfine "target/release/coreutils sort shuffled_numbers.txt -n -o output.txt"` becomes Example: `hyperfine "target/release/coreutils sort shuffled_numbers.txt -n -o output.txt"` becomes

View file

@ -11,7 +11,8 @@
// https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sort.html // https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sort.html
// https://www.gnu.org/software/coreutils/manual/html_node/sort-invocation.html // https://www.gnu.org/software/coreutils/manual/html_node/sort-invocation.html
// spell-checker:ignore (ToDO) outfile nondictionary // spell-checker:ignore (misc) HFKJFK Mbdfhn
#[macro_use] #[macro_use]
extern crate uucore; extern crate uucore;
@ -143,7 +144,7 @@ pub struct GlobalSettings {
ignore_non_printing: bool, ignore_non_printing: bool,
merge: bool, merge: bool,
reverse: bool, reverse: bool,
outfile: Option<String>, output_file: Option<String>,
stable: bool, stable: bool,
unique: bool, unique: bool,
check: bool, check: bool,
@ -187,7 +188,7 @@ impl GlobalSettings {
} }
fn out_writer(&self) -> BufWriter<Box<dyn Write>> { fn out_writer(&self) -> BufWriter<Box<dyn Write>> {
match self.outfile { match self.output_file {
Some(ref filename) => match File::create(Path::new(&filename)) { Some(ref filename) => match File::create(Path::new(&filename)) {
Ok(f) => BufWriter::new(Box::new(f) as Box<dyn Write>), Ok(f) => BufWriter::new(Box::new(f) as Box<dyn Write>),
Err(e) => { Err(e) => {
@ -211,7 +212,7 @@ impl Default for GlobalSettings {
ignore_non_printing: false, ignore_non_printing: false,
merge: false, merge: false,
reverse: false, reverse: false,
outfile: None, output_file: None,
stable: false, stable: false,
unique: false, unique: false,
check: false, check: false,
@ -1168,7 +1169,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
settings.ignore_blanks = matches.is_present(OPT_IGNORE_BLANKS); settings.ignore_blanks = matches.is_present(OPT_IGNORE_BLANKS);
settings.outfile = matches.value_of(OPT_OUTPUT).map(String::from); settings.output_file = matches.value_of(OPT_OUTPUT).map(String::from);
settings.reverse = matches.is_present(OPT_REVERSE); settings.reverse = matches.is_present(OPT_REVERSE);
settings.stable = matches.is_present(OPT_STABLE); settings.stable = matches.is_present(OPT_STABLE);
settings.unique = matches.is_present(OPT_UNIQUE); settings.unique = matches.is_present(OPT_UNIQUE);