system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-10-15 04:14:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4629 from tertsdiepraam/uniq-remove-strum

Browse source 
`uniq`: remove `strum` dependency
This commit is contained in:
Sylvestre Ledru 2023-03-25 16:00:38 +01:00 committed by GitHub
parent d5678e5120 5a60aa0a19
commit c0bd851184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Cargo.lock generated
View file

@ -1030,12 +1030,6 @@ dependencies = [
"ahash",
]
[[package]]
name = "heck"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
[[package]]
name = "hermit-abi"
version = "0.1.19"
@ -1917,12 +1911,6 @@ dependencies = [
"windows-sys 0.45.0",
]
[[package]]
name = "rustversion"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
[[package]]
name = "same-file"
version = "1.0.6"
@ -2108,25 +2096,6 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
[[package]]
name = "strum_macros"
version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
"syn",
]
[[package]]
name = "subtle"
version = "2.4.1"
@ -3230,8 +3199,6 @@ name = "uu_uniq"
version = "0.0.17"
dependencies = [
"clap",
"strum",
"strum_macros",
"uucore",
]

2
Cargo.toml
View file

@ -316,8 +316,6 @@ same-file = "1.0.6"
selinux = "0.4"
signal-hook = "0.3.14"
smallvec = { version = "1.10", features = ["union"] }
strum = "0.24.1"
strum_macros = "0.24.2"
tempfile = "3.4.0"
term_grid = "0.1.5"
terminal_size = "0.2.5"

2
src/uu/uniq/Cargo.toml
View file

@ -16,8 +16,6 @@ path = "src/uniq.rs"
[dependencies]
clap = { workspace=true }
strum = { workspace=true }
strum_macros = { workspace=true }
uucore = { workspace=true }
[[bin]]

13
src/uu/uniq/src/uniq.rs
View file

@ -10,7 +10,6 @@ use std::fs::File;
use std::io::{self, stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
use std::path::Path;
use std::str::FromStr;
use strum_macros::{AsRefStr, EnumString};
use uucore::display::Quotable;
use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
use uucore::format_usage;
@ -38,8 +37,7 @@ pub mod options {
static ARG_FILES: &str = "files";
#[derive(PartialEq, Clone, Copy, AsRefStr, EnumString)]
#[strum(serialize_all = "snake_case")]
#[derive(PartialEq, Clone, Copy)]
enum Delimiters {
Append,
Prepend,
@ -403,7 +401,14 @@ fn get_delimiter(matches: &ArgMatches) -> Delimiters {
.get_one::<String>(options::ALL_REPEATED)
.or_else(|| matches.get_one::<String>(options::GROUP));
if let Some(delimiter_arg) = value {
Delimiters::from_str(delimiter_arg).unwrap() // All possible values for ALL_REPEATED are Delimiters (of type `&str`)
match delimiter_arg.as_ref() {
"append" => Delimiters::Append,
"prepend" => Delimiters::Prepend,
"separate" => Delimiters::Separate,
"both" => Delimiters::Both,
"none" => Delimiters::None,
_ => unreachable!("Should have been caught by possible values in clap"),
}
} else if matches.contains_id(options::GROUP) {
Delimiters::Separate
} else {