RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2026-01-21 04:31:13 +00:00
Code Issues Activity

split: small tweaks to wording

Browse source 
changes `SuffixType` enums to have better names and hex suffix help to be consistent with numeric suffix help
This commit is contained in:
ndd7xv 2022-02-16 23:48:12 -05:00
parent 6c3fc7b214
commit 494d709e0f
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/uu/split/src/filenames.rs
View file

@ -36,10 +36,10 @@ pub enum SuffixType {
Alphabetic,
/// Decimal numbers.
NumericDecimal,
Decimal,
/// Hexadecimal numbers.
NumericHexadecimal,
Hexadecimal,
}
impl SuffixType {
@ -47,8 +47,8 @@ impl SuffixType {
pub fn radix(&self) -> u8 {
match self {
SuffixType::Alphabetic => 26,
SuffixType::NumericDecimal => 10,
SuffixType::NumericHexadecimal => 16,
SuffixType::Decimal => 10,
SuffixType::Hexadecimal => 16,
}
}
}
@ -90,7 +90,7 @@ impl SuffixType {
/// assert_eq!(it.next().unwrap(), "chunk_ac.txt");
/// ```
///
/// For decimal numeric filenames, use `SuffixType::NumericDecimal`:
/// For decimal numeric filenames, use `SuffixType::Decimal`:
///
/// ```rust,ignore
/// use crate::filenames::FilenameIterator;
@ -99,7 +99,7 @@ impl SuffixType {
/// let prefix = "chunk_".to_string();
/// let suffix = ".txt".to_string();
/// let width = 2;
/// let suffix_type = SuffixType::NumericDecimal;
/// let suffix_type = SuffixType::Decimal;
/// let it = FilenameIterator::new(prefix, suffix, width, suffix_type);
///
/// assert_eq!(it.next().unwrap(), "chunk_00.txt");
@ -173,12 +173,12 @@ mod tests {
#[test]
fn test_filename_iterator_numeric_fixed_width() {
let mut it = FilenameIterator::new("chunk_", ".txt", 2, SuffixType::NumericDecimal);
let mut it = FilenameIterator::new("chunk_", ".txt", 2, SuffixType::Decimal);
assert_eq!(it.next().unwrap(), "chunk_00.txt");
assert_eq!(it.next().unwrap(), "chunk_01.txt");
assert_eq!(it.next().unwrap(), "chunk_02.txt");
let mut it = FilenameIterator::new("chunk_", ".txt", 2, SuffixType::NumericDecimal);
let mut it = FilenameIterator::new("chunk_", ".txt", 2, SuffixType::Decimal);
assert_eq!(it.nth(10 * 10 - 1).unwrap(), "chunk_99.txt");
assert_eq!(it.next(), None);
}
@ -198,12 +198,12 @@ mod tests {
#[test]
fn test_filename_iterator_numeric_dynamic_width() {
let mut it = FilenameIterator::new("chunk_", ".txt", 0, SuffixType::NumericDecimal);
let mut it = FilenameIterator::new("chunk_", ".txt", 0, SuffixType::Decimal);
assert_eq!(it.next().unwrap(), "chunk_00.txt");
assert_eq!(it.next().unwrap(), "chunk_01.txt");
assert_eq!(it.next().unwrap(), "chunk_02.txt");
let mut it = FilenameIterator::new("chunk_", ".txt", 0, SuffixType::NumericDecimal);
let mut it = FilenameIterator::new("chunk_", ".txt", 0, SuffixType::Decimal);
assert_eq!(it.nth(10 * 9 - 1).unwrap(), "chunk_89.txt");
assert_eq!(it.next().unwrap(), "chunk_9000.txt");
assert_eq!(it.next().unwrap(), "chunk_9001.txt");

6
src/uu/split/src/split.rs
View file

@ -150,7 +150,7 @@ pub fn uu_app<'a>() -> App<'a> {
.long(OPT_HEX_SUFFIXES)
.takes_value(true)
.default_missing_value("0")
.help("use hex suffixes starting at 0, not alphabetic"),
.help("use hex suffixes instead of alphabetic"),
)
.arg(
Arg::new(OPT_VERBOSE)
@ -263,9 +263,9 @@ impl Strategy {
/// Parse the suffix type from the command-line arguments.
fn suffix_type_from(matches: &ArgMatches) -> SuffixType {
if matches.occurrences_of(OPT_NUMERIC_SUFFIXES) > 0 {
SuffixType::NumericDecimal
SuffixType::Decimal
} else if matches.occurrences_of(OPT_HEX_SUFFIXES) > 0 {
SuffixType::NumericHexadecimal
SuffixType::Hexadecimal
} else {
SuffixType::Alphabetic
}