--- a/Cargo.toml +++ b/Cargo.toml @@ -379,7 +379,6 @@ compare = "0.1.0" crossterm = { version = "0.29.0", default-features = false } ctor = "0.6.0" ctrlc = { version = "3.4.7", features = ["termination"] } -divan = { package = "codspeed-divan-compat", version = "4.0.5" } dns-lookup = { version = "3.0.0" } exacl = "0.12.0" file_diff = "1.0.0" @@ -410,7 +409,7 @@ memchr = "2.7.2" memmap2 = "0.9.4" nix = { version = "0.30", default-features = false } nom = "8.0.0" -notify = { version = "=8.2.0", features = ["macos_kqueue"] } +notify = { version = "8.2.0" } num-bigint = "0.4.4" num-prime = "0.5.0" num-traits = "0.2.19" @@ -430,7 +429,7 @@ rustc-hash = "2.1.1" rust-ini = "0.21.0" same-file = "1.0.6" self_cell = "1.0.4" -selinux = "=0.6.0" +selinux = "0.6.0" string-interner = "0.19.0" tempfile = "3.15.0" terminal_size = "0.4.0" --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -50,10 +50,6 @@ base64-simd = { version = "0.8", optiona libc = { workspace = true, optional = true } os_display = "0.1.3" -# Benchmark dependencies (optional) -divan = { workspace = true, optional = true } -tempfile = { workspace = true, optional = true } - digest = { workspace = true, optional = true } hex = { workspace = true, optional = true } memchr = { workspace = true, optional = true } @@ -203,4 +199,3 @@ wide = [] tty = [] time = ["jiff"] uptime = ["jiff", "libc", "windows-sys", "utmpx", "utmp-classic"] -benchmark = ["divan", "itertools", "tempfile"] --- a/src/uu/base64/Cargo.toml +++ b/src/uu/base64/Cargo.toml @@ -25,14 +25,9 @@ uu_base32 = { workspace = true } fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "base64" path = "src/main.rs" - -[[bench]] -name = "base64_bench" -harness = false --- a/src/uu/cksum/Cargo.toml +++ b/src/uu/cksum/Cargo.toml @@ -30,13 +30,9 @@ uu_checksum_common = { workspace = true fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "cksum" path = "src/main.rs" -[[bench]] -name = "cksum_bench" -harness = false --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -48,13 +48,8 @@ name = "cp" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } - -[[bench]] -name = "cp_bench" -harness = false +uucore = { workspace = true } [features] feat_selinux = ["selinux", "uucore/selinux"] --- a/src/uu/csplit/Cargo.toml +++ b/src/uu/csplit/Cargo.toml @@ -30,10 +30,6 @@ name = "csplit" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "csplit_bench" -harness = false --- a/src/uu/cut/Cargo.toml +++ b/src/uu/cut/Cargo.toml @@ -26,13 +26,9 @@ bstr = { workspace = true } fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "cut" path = "src/main.rs" -[[bench]] -name = "cut_bench" -harness = false --- a/src/uu/date/Cargo.toml +++ b/src/uu/date/Cargo.toml @@ -57,10 +57,6 @@ name = "date" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "date_bench" -harness = false --- a/src/uu/dd/Cargo.toml +++ b/src/uu/dd/Cargo.toml @@ -40,10 +40,6 @@ name = "dd" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "dd_bench" -harness = false --- a/src/uu/df/Cargo.toml +++ b/src/uu/df/Cargo.toml @@ -26,14 +26,10 @@ thiserror = { workspace = true } fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "df" path = "src/main.rs" -[[bench]] -name = "df_bench" -harness = false --- a/src/uu/du/Cargo.toml +++ b/src/uu/du/Cargo.toml @@ -47,10 +47,6 @@ name = "du" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "du_bench" -harness = false --- a/src/uu/expand/Cargo.toml +++ b/src/uu/expand/Cargo.toml @@ -26,14 +26,9 @@ thiserror = { workspace = true } fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "expand" path = "src/main.rs" - -[[bench]] -name = "expand_bench" -harness = false --- a/src/uu/factor/Cargo.toml +++ b/src/uu/factor/Cargo.toml @@ -31,12 +31,8 @@ name = "factor" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [lib] path = "src/factor.rs" -[[bench]] -name = "factor_bench" -harness = false --- a/src/uu/false/Cargo.toml +++ b/src/uu/false/Cargo.toml @@ -29,9 +29,5 @@ name = "false" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "false_bench" -harness = false --- a/src/uu/fold/Cargo.toml +++ b/src/uu/fold/Cargo.toml @@ -25,14 +25,10 @@ fluent = { workspace = true } unicode-width = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "fold" path = "src/main.rs" -[[bench]] -name = "fold_bench" -harness = false --- a/src/uu/hostname/Cargo.toml +++ b/src/uu/hostname/Cargo.toml @@ -45,6 +45,5 @@ name = "hostname_bench" harness = false [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } --- a/src/uu/join/Cargo.toml +++ b/src/uu/join/Cargo.toml @@ -30,10 +30,6 @@ name = "join" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "join_bench" -harness = false --- a/src/uu/ls/Cargo.toml +++ b/src/uu/ls/Cargo.toml @@ -51,13 +51,8 @@ name = "ls" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } - -[[bench]] -name = "ls_bench" -harness = false +uucore = { workspace = true } [features] feat_selinux = ["selinux", "uucore/selinux"] --- a/src/uu/mv/Cargo.toml +++ b/src/uu/mv/Cargo.toml @@ -51,10 +51,6 @@ name = "mv" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "mv_bench" -harness = false --- a/src/uu/nl/Cargo.toml +++ b/src/uu/nl/Cargo.toml @@ -26,14 +26,10 @@ uucore = { workspace = true } fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "nl" path = "src/main.rs" -[[bench]] -name = "nl_bench" -harness = false --- a/src/uu/numfmt/Cargo.toml +++ b/src/uu/numfmt/Cargo.toml @@ -26,13 +26,9 @@ fluent = { workspace = true } memchr = { workspace = true } [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "numfmt" path = "src/main.rs" -[[bench]] -name = "numfmt_bench" -harness = false --- a/src/uu/rm/Cargo.toml +++ b/src/uu/rm/Cargo.toml @@ -39,9 +39,8 @@ name = "rm" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bench]] name = "rm_bench" --- a/src/uu/seq/Cargo.toml +++ b/src/uu/seq/Cargo.toml @@ -40,9 +40,5 @@ name = "seq" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "seq_bench" -harness = false --- a/src/uu/shuf/Cargo.toml +++ b/src/uu/shuf/Cargo.toml @@ -32,10 +32,5 @@ rustc-hash = { workspace = true } name = "shuf" path = "src/main.rs" -[[bench]] -name = "shuf_bench" -harness = false - [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } --- a/src/uu/sort/Cargo.toml +++ b/src/uu/sort/Cargo.toml @@ -53,10 +53,8 @@ ctrlc = { workspace = true } nix = { workspace = true, features = ["resource"] } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } uucore = { workspace = true, features = [ - "benchmark", "fs", "parser-size", "version-cmp", @@ -67,18 +65,3 @@ uucore = { workspace = true, features = name = "sort" path = "src/main.rs" -[[bench]] -name = "sort_bench" -harness = false - -[[bench]] -name = "sort_locale_c_bench" -harness = false - -[[bench]] -name = "sort_locale_utf8_bench" -harness = false - -[[bench]] -name = "sort_locale_de_bench" -harness = false --- a/src/uu/split/Cargo.toml +++ b/src/uu/split/Cargo.toml @@ -30,10 +30,6 @@ name = "split" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "split_bench" -harness = false --- a/src/uu/true/Cargo.toml +++ b/src/uu/true/Cargo.toml @@ -28,9 +28,5 @@ name = "true" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "true_bench" -harness = false --- a/src/uu/tsort/Cargo.toml +++ b/src/uu/tsort/Cargo.toml @@ -35,9 +35,5 @@ name = "tsort" path = "src/main.rs" [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } -[[bench]] -name = "tsort_bench" -harness = false --- a/src/uu/unexpand/Cargo.toml +++ b/src/uu/unexpand/Cargo.toml @@ -25,14 +25,9 @@ uucore = { workspace = true } fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "unexpand" path = "src/main.rs" - -[[bench]] -name = "unexpand_bench" -harness = false --- a/src/uu/uniq/Cargo.toml +++ b/src/uu/uniq/Cargo.toml @@ -24,13 +24,9 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -divan = { workspace = true } -uucore = { workspace = true, features = ["benchmark", "parser"] } +uucore = { workspace = true, features = ["parser"] } [[bin]] name = "uniq" path = "src/main.rs" -[[bench]] -name = "uniq_bench" -harness = false --- a/src/uu/wc/Cargo.toml +++ b/src/uu/wc/Cargo.toml @@ -36,14 +36,10 @@ libc = { workspace = true } nix = { workspace = true } [dev-dependencies] -divan = { workspace = true } tempfile = { workspace = true } -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "wc" path = "src/main.rs" -[[bench]] -name = "wc_bench" -harness = false --- a/src/uu/b2sum/Cargo.toml +++ b/src/uu/b2sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "b2sum" --- a/src/uu/md5sum/Cargo.toml +++ b/src/uu/md5sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "md5sum" --- a/src/uu/sha1sum/Cargo.toml +++ b/src/uu/sha1sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "sha1sum" --- a/src/uu/sha224sum/Cargo.toml +++ b/src/uu/sha224sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "sha224sum" --- a/src/uu/sha256sum/Cargo.toml +++ b/src/uu/sha256sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "sha256sum" --- a/src/uu/sha384sum/Cargo.toml +++ b/src/uu/sha384sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "sha384sum" --- a/src/uu/sha512sum/Cargo.toml +++ b/src/uu/sha512sum/Cargo.toml @@ -30,7 +30,7 @@ uucore = { workspace = true, features = fluent = { workspace = true } [dev-dependencies] -uucore = { workspace = true, features = ["benchmark"] } +uucore = { workspace = true } [[bin]] name = "sha512sum"