diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47793977e..1cb9b333a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,6 +24,8 @@ search the issues to make sure no one else is working on it. 1. The code must be clippy-warning-free and rustfmt-compliant. 1. Don't hesitate to move common functions into uucore if they can be reused by other binaries. 1. Unsafe code should be documented with Safety comments. +1. uutils is original code. It cannot contain code from existing GNU or Unix-like + utilities, nor should it link to or reference GNU libraries. ## Commit messages @@ -82,3 +84,29 @@ uutils: add new utility ``` gitignore: add temporary files ``` + +## Licensing + +uutils is distributed under the terms of the MIT License; see the `LICENSE` file +for details. This is a permissive license, which allows the software to be used +with few restrictions. + +Copyrights in the uutils project are retained by their contributors, and no +copyright assignment is required to contribute. + +If you wish to add or change dependencies as part of a contribution to the +project, a tool like `cargo-license` can be used to show their license details. +The following types of license are acceptable: + +* MIT License +* Dual- or tri-license with an MIT License option ("Apache-2.0 or MIT" is a popular combination) +* "MIT equivalent" license (2-clause BSD, 3-clause BSD, ISC) +* License less restrictive than the MIT License (CC0 1.0 Universal) + +Licenses we will not use: + +* An ambiguous license, or no license +* Strongly reciprocal licenses (GNU GPL, GNU LGPL) + +If you wish to add a reference but it doesn't meet these requirements, please +raise an issue to describe the dependency. diff --git a/Cargo.lock b/Cargo.lock index 5366d9024..03b64361e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,7 +224,7 @@ dependencies = [ [[package]] name = "coreutils" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "chrono", @@ -759,9 +759,9 @@ checksum = "46dbcb333e86939721589d25a3557e180b52778cb33c7fdfe9e0158ff790d5ec" [[package]] name = "instant" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", ] @@ -1655,18 +1655,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ "proc-macro2", "quote 1.0.9", @@ -1691,9 +1691,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" @@ -1747,7 +1747,7 @@ checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b" [[package]] name = "uu_arch" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "platform-info", @@ -1757,7 +1757,7 @@ dependencies = [ [[package]] name = "uu_base32" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -1766,7 +1766,7 @@ dependencies = [ [[package]] name = "uu_base64" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uu_base32", @@ -1776,7 +1776,7 @@ dependencies = [ [[package]] name = "uu_basename" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -1785,7 +1785,7 @@ dependencies = [ [[package]] name = "uu_cat" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "clap", @@ -1798,7 +1798,7 @@ dependencies = [ [[package]] name = "uu_chgrp" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -1808,7 +1808,7 @@ dependencies = [ [[package]] name = "uu_chmod" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "uu_chown" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "glob 0.3.0", @@ -1830,7 +1830,7 @@ dependencies = [ [[package]] name = "uu_chroot" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -1839,7 +1839,7 @@ dependencies = [ [[package]] name = "uu_cksum" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -1849,7 +1849,7 @@ dependencies = [ [[package]] name = "uu_comm" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -1859,7 +1859,7 @@ dependencies = [ [[package]] name = "uu_cp" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "filetime", @@ -1875,7 +1875,7 @@ dependencies = [ [[package]] name = "uu_csplit" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "glob 0.2.11", @@ -1887,7 +1887,7 @@ dependencies = [ [[package]] name = "uu_cut" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "bstr", @@ -1899,7 +1899,7 @@ dependencies = [ [[package]] name = "uu_date" -version = "0.0.6" +version = "0.0.7" dependencies = [ "chrono", "clap", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "uu_df" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "number_prefix", @@ -1936,7 +1936,7 @@ dependencies = [ [[package]] name = "uu_dircolors" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "glob 0.3.0", @@ -1946,7 +1946,7 @@ dependencies = [ [[package]] name = "uu_dirname" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "uu_du" -version = "0.0.6" +version = "0.0.7" dependencies = [ "chrono", "clap", @@ -1967,7 +1967,7 @@ dependencies = [ [[package]] name = "uu_echo" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -1976,7 +1976,7 @@ dependencies = [ [[package]] name = "uu_env" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -1987,7 +1987,7 @@ dependencies = [ [[package]] name = "uu_expand" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "unicode-width", @@ -1997,7 +1997,7 @@ dependencies = [ [[package]] name = "uu_expr" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2010,7 +2010,7 @@ dependencies = [ [[package]] name = "uu_factor" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "coz", @@ -2025,7 +2025,7 @@ dependencies = [ [[package]] name = "uu_false" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2034,7 +2034,7 @@ dependencies = [ [[package]] name = "uu_fmt" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2045,7 +2045,7 @@ dependencies = [ [[package]] name = "uu_fold" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2054,7 +2054,7 @@ dependencies = [ [[package]] name = "uu_groups" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2063,7 +2063,7 @@ dependencies = [ [[package]] name = "uu_hashsum" -version = "0.0.6" +version = "0.0.7" dependencies = [ "blake2b_simd", "clap", @@ -2082,7 +2082,7 @@ dependencies = [ [[package]] name = "uu_head" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2091,7 +2091,7 @@ dependencies = [ [[package]] name = "uu_hostid" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2101,7 +2101,7 @@ dependencies = [ [[package]] name = "uu_hostname" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "hostname", @@ -2113,7 +2113,7 @@ dependencies = [ [[package]] name = "uu_id" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2122,7 +2122,7 @@ dependencies = [ [[package]] name = "uu_install" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "file_diff", @@ -2135,7 +2135,7 @@ dependencies = [ [[package]] name = "uu_join" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2144,7 +2144,7 @@ dependencies = [ [[package]] name = "uu_kill" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2154,7 +2154,7 @@ dependencies = [ [[package]] name = "uu_link" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "uu_ln" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2174,7 +2174,7 @@ dependencies = [ [[package]] name = "uu_logname" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2184,7 +2184,7 @@ dependencies = [ [[package]] name = "uu_ls" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "chrono", @@ -2204,7 +2204,7 @@ dependencies = [ [[package]] name = "uu_mkdir" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2214,7 +2214,7 @@ dependencies = [ [[package]] name = "uu_mkfifo" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2224,7 +2224,7 @@ dependencies = [ [[package]] name = "uu_mknod" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2234,7 +2234,7 @@ dependencies = [ [[package]] name = "uu_mktemp" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "rand 0.5.6", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "uu_more" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "clap", @@ -2261,7 +2261,7 @@ dependencies = [ [[package]] name = "uu_mv" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "fs_extra", @@ -2271,7 +2271,7 @@ dependencies = [ [[package]] name = "uu_nice" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2282,7 +2282,7 @@ dependencies = [ [[package]] name = "uu_nl" -version = "0.0.6" +version = "0.0.7" dependencies = [ "aho-corasick", "clap", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "uu_nohup" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "clap", @@ -2307,7 +2307,7 @@ dependencies = [ [[package]] name = "uu_nproc" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2318,7 +2318,7 @@ dependencies = [ [[package]] name = "uu_numfmt" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2327,7 +2327,7 @@ dependencies = [ [[package]] name = "uu_od" -version = "0.0.6" +version = "0.0.7" dependencies = [ "byteorder", "clap", @@ -2339,7 +2339,7 @@ dependencies = [ [[package]] name = "uu_paste" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "uu_pathchk" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2358,7 +2358,7 @@ dependencies = [ [[package]] name = "uu_pinky" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2367,7 +2367,7 @@ dependencies = [ [[package]] name = "uu_pr" -version = "0.0.6" +version = "0.0.7" dependencies = [ "chrono", "clap", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "uu_printenv" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2391,7 +2391,7 @@ dependencies = [ [[package]] name = "uu_printf" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "itertools 0.8.2", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "uu_ptx" -version = "0.0.6" +version = "0.0.7" dependencies = [ "aho-corasick", "clap", @@ -2415,7 +2415,7 @@ dependencies = [ [[package]] name = "uu_pwd" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2424,7 +2424,7 @@ dependencies = [ [[package]] name = "uu_readlink" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2434,7 +2434,7 @@ dependencies = [ [[package]] name = "uu_realpath" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2443,7 +2443,7 @@ dependencies = [ [[package]] name = "uu_relpath" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2452,7 +2452,7 @@ dependencies = [ [[package]] name = "uu_rm" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "remove_dir_all", @@ -2464,7 +2464,7 @@ dependencies = [ [[package]] name = "uu_rmdir" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2473,7 +2473,7 @@ dependencies = [ [[package]] name = "uu_seq" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "num-bigint", @@ -2484,7 +2484,7 @@ dependencies = [ [[package]] name = "uu_shred" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "filetime", @@ -2497,7 +2497,7 @@ dependencies = [ [[package]] name = "uu_shuf" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "rand 0.5.6", @@ -2507,7 +2507,7 @@ dependencies = [ [[package]] name = "uu_sleep" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "uu_sort" -version = "0.0.6" +version = "0.0.7" dependencies = [ "binary-heap-plus", "clap", @@ -2535,7 +2535,7 @@ dependencies = [ [[package]] name = "uu_split" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2544,7 +2544,7 @@ dependencies = [ [[package]] name = "uu_stat" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2553,7 +2553,7 @@ dependencies = [ [[package]] name = "uu_stdbuf" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "tempfile", @@ -2564,7 +2564,7 @@ dependencies = [ [[package]] name = "uu_stdbuf_libstdbuf" -version = "0.0.6" +version = "0.0.7" dependencies = [ "cpp", "cpp_build", @@ -2575,7 +2575,7 @@ dependencies = [ [[package]] name = "uu_sum" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2584,7 +2584,7 @@ dependencies = [ [[package]] name = "uu_sync" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2595,7 +2595,7 @@ dependencies = [ [[package]] name = "uu_tac" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2604,7 +2604,7 @@ dependencies = [ [[package]] name = "uu_tail" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2616,7 +2616,7 @@ dependencies = [ [[package]] name = "uu_tee" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "uu_test" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2638,7 +2638,7 @@ dependencies = [ [[package]] name = "uu_timeout" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2649,7 +2649,7 @@ dependencies = [ [[package]] name = "uu_touch" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "filetime", @@ -2660,7 +2660,7 @@ dependencies = [ [[package]] name = "uu_tr" -version = "0.0.6" +version = "0.0.7" dependencies = [ "bit-set", "clap", @@ -2671,7 +2671,7 @@ dependencies = [ [[package]] name = "uu_true" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2680,7 +2680,7 @@ dependencies = [ [[package]] name = "uu_truncate" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2689,7 +2689,7 @@ dependencies = [ [[package]] name = "uu_tsort" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2698,7 +2698,7 @@ dependencies = [ [[package]] name = "uu_tty" -version = "0.0.6" +version = "0.0.7" dependencies = [ "atty", "clap", @@ -2709,7 +2709,7 @@ dependencies = [ [[package]] name = "uu_uname" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "platform-info", @@ -2719,7 +2719,7 @@ dependencies = [ [[package]] name = "uu_unexpand" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "unicode-width", @@ -2729,7 +2729,7 @@ dependencies = [ [[package]] name = "uu_uniq" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "strum", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "uu_unlink" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2750,7 +2750,7 @@ dependencies = [ [[package]] name = "uu_uptime" -version = "0.0.6" +version = "0.0.7" dependencies = [ "chrono", "clap", @@ -2760,7 +2760,7 @@ dependencies = [ [[package]] name = "uu_users" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2769,7 +2769,7 @@ dependencies = [ [[package]] name = "uu_wc" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "libc", @@ -2781,7 +2781,7 @@ dependencies = [ [[package]] name = "uu_who" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2790,7 +2790,7 @@ dependencies = [ [[package]] name = "uu_whoami" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2800,7 +2800,7 @@ dependencies = [ [[package]] name = "uu_yes" -version = "0.0.6" +version = "0.0.7" dependencies = [ "clap", "uucore", @@ -2809,7 +2809,7 @@ dependencies = [ [[package]] name = "uucore" -version = "0.0.8" +version = "0.0.9" dependencies = [ "data-encoding", "dns-lookup", @@ -2828,7 +2828,7 @@ dependencies = [ [[package]] name = "uucore_procs" -version = "0.0.5" +version = "0.0.6" dependencies = [ "proc-macro2", "quote 1.0.9", diff --git a/Cargo.toml b/Cargo.toml index b05db2c98..c76af8d84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "coreutils" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "coreutils ~ GNU coreutils (updated); implemented as universal (cross-platform) utils, written in Rust" @@ -229,106 +229,106 @@ test = [ "uu_test" ] clap = { version = "2.33", features = ["wrap_help"] } lazy_static = { version="1.3" } textwrap = { version="=0.11.0", features=["term_size"] } # !maint: [2020-05-10; rivy] unstable crate using undocumented features; pinned currently, will review -uucore = { version=">=0.0.8", package="uucore", path="src/uucore" } +uucore = { version=">=0.0.9", package="uucore", path="src/uucore" } # * uutils -uu_test = { optional=true, version="0.0.6", package="uu_test", path="src/uu/test" } +uu_test = { optional=true, version="0.0.7", package="uu_test", path="src/uu/test" } # -arch = { optional=true, version="0.0.6", package="uu_arch", path="src/uu/arch" } -base32 = { optional=true, version="0.0.6", package="uu_base32", path="src/uu/base32" } -base64 = { optional=true, version="0.0.6", package="uu_base64", path="src/uu/base64" } -basename = { optional=true, version="0.0.6", package="uu_basename", path="src/uu/basename" } -cat = { optional=true, version="0.0.6", package="uu_cat", path="src/uu/cat" } -chgrp = { optional=true, version="0.0.6", package="uu_chgrp", path="src/uu/chgrp" } -chmod = { optional=true, version="0.0.6", package="uu_chmod", path="src/uu/chmod" } -chown = { optional=true, version="0.0.6", package="uu_chown", path="src/uu/chown" } -chroot = { optional=true, version="0.0.6", package="uu_chroot", path="src/uu/chroot" } -cksum = { optional=true, version="0.0.6", package="uu_cksum", path="src/uu/cksum" } -comm = { optional=true, version="0.0.6", package="uu_comm", path="src/uu/comm" } -cp = { optional=true, version="0.0.6", package="uu_cp", path="src/uu/cp" } -csplit = { optional=true, version="0.0.6", package="uu_csplit", path="src/uu/csplit" } -cut = { optional=true, version="0.0.6", package="uu_cut", path="src/uu/cut" } -date = { optional=true, version="0.0.6", package="uu_date", path="src/uu/date" } -dd = { optional=true, version="0.0.6", package="uu_dd", path="src/uu/dd" } -df = { optional=true, version="0.0.6", package="uu_df", path="src/uu/df" } -dircolors= { optional=true, version="0.0.6", package="uu_dircolors", path="src/uu/dircolors" } -dirname = { optional=true, version="0.0.6", package="uu_dirname", path="src/uu/dirname" } -du = { optional=true, version="0.0.6", package="uu_du", path="src/uu/du" } -echo = { optional=true, version="0.0.6", package="uu_echo", path="src/uu/echo" } -env = { optional=true, version="0.0.6", package="uu_env", path="src/uu/env" } -expand = { optional=true, version="0.0.6", package="uu_expand", path="src/uu/expand" } -expr = { optional=true, version="0.0.6", package="uu_expr", path="src/uu/expr" } -factor = { optional=true, version="0.0.6", package="uu_factor", path="src/uu/factor" } -false = { optional=true, version="0.0.6", package="uu_false", path="src/uu/false" } -fmt = { optional=true, version="0.0.6", package="uu_fmt", path="src/uu/fmt" } -fold = { optional=true, version="0.0.6", package="uu_fold", path="src/uu/fold" } -groups = { optional=true, version="0.0.6", package="uu_groups", path="src/uu/groups" } -hashsum = { optional=true, version="0.0.6", package="uu_hashsum", path="src/uu/hashsum" } -head = { optional=true, version="0.0.6", package="uu_head", path="src/uu/head" } -hostid = { optional=true, version="0.0.6", package="uu_hostid", path="src/uu/hostid" } -hostname = { optional=true, version="0.0.6", package="uu_hostname", path="src/uu/hostname" } -id = { optional=true, version="0.0.6", package="uu_id", path="src/uu/id" } -install = { optional=true, version="0.0.6", package="uu_install", path="src/uu/install" } -join = { optional=true, version="0.0.6", package="uu_join", path="src/uu/join" } -kill = { optional=true, version="0.0.6", package="uu_kill", path="src/uu/kill" } -link = { optional=true, version="0.0.6", package="uu_link", path="src/uu/link" } -ln = { optional=true, version="0.0.6", package="uu_ln", path="src/uu/ln" } -ls = { optional=true, version="0.0.6", package="uu_ls", path="src/uu/ls" } -logname = { optional=true, version="0.0.6", package="uu_logname", path="src/uu/logname" } -mkdir = { optional=true, version="0.0.6", package="uu_mkdir", path="src/uu/mkdir" } -mkfifo = { optional=true, version="0.0.6", package="uu_mkfifo", path="src/uu/mkfifo" } -mknod = { optional=true, version="0.0.6", package="uu_mknod", path="src/uu/mknod" } -mktemp = { optional=true, version="0.0.6", package="uu_mktemp", path="src/uu/mktemp" } -more = { optional=true, version="0.0.6", package="uu_more", path="src/uu/more" } -mv = { optional=true, version="0.0.6", package="uu_mv", path="src/uu/mv" } -nice = { optional=true, version="0.0.6", package="uu_nice", path="src/uu/nice" } -nl = { optional=true, version="0.0.6", package="uu_nl", path="src/uu/nl" } -nohup = { optional=true, version="0.0.6", package="uu_nohup", path="src/uu/nohup" } -nproc = { optional=true, version="0.0.6", package="uu_nproc", path="src/uu/nproc" } -numfmt = { optional=true, version="0.0.6", package="uu_numfmt", path="src/uu/numfmt" } -od = { optional=true, version="0.0.6", package="uu_od", path="src/uu/od" } -paste = { optional=true, version="0.0.6", package="uu_paste", path="src/uu/paste" } -pathchk = { optional=true, version="0.0.6", package="uu_pathchk", path="src/uu/pathchk" } -pinky = { optional=true, version="0.0.6", package="uu_pinky", path="src/uu/pinky" } -pr = { optional=true, version="0.0.6", package="uu_pr", path="src/uu/pr" } -printenv = { optional=true, version="0.0.6", package="uu_printenv", path="src/uu/printenv" } -printf = { optional=true, version="0.0.6", package="uu_printf", path="src/uu/printf" } -ptx = { optional=true, version="0.0.6", package="uu_ptx", path="src/uu/ptx" } -pwd = { optional=true, version="0.0.6", package="uu_pwd", path="src/uu/pwd" } -readlink = { optional=true, version="0.0.6", package="uu_readlink", path="src/uu/readlink" } -realpath = { optional=true, version="0.0.6", package="uu_realpath", path="src/uu/realpath" } -relpath = { optional=true, version="0.0.6", package="uu_relpath", path="src/uu/relpath" } -rm = { optional=true, version="0.0.6", package="uu_rm", path="src/uu/rm" } -rmdir = { optional=true, version="0.0.6", package="uu_rmdir", path="src/uu/rmdir" } -seq = { optional=true, version="0.0.6", package="uu_seq", path="src/uu/seq" } -shred = { optional=true, version="0.0.6", package="uu_shred", path="src/uu/shred" } -shuf = { optional=true, version="0.0.6", package="uu_shuf", path="src/uu/shuf" } -sleep = { optional=true, version="0.0.6", package="uu_sleep", path="src/uu/sleep" } -sort = { optional=true, version="0.0.6", package="uu_sort", path="src/uu/sort" } -split = { optional=true, version="0.0.6", package="uu_split", path="src/uu/split" } -stat = { optional=true, version="0.0.6", package="uu_stat", path="src/uu/stat" } -stdbuf = { optional=true, version="0.0.6", package="uu_stdbuf", path="src/uu/stdbuf" } -sum = { optional=true, version="0.0.6", package="uu_sum", path="src/uu/sum" } -sync = { optional=true, version="0.0.6", package="uu_sync", path="src/uu/sync" } -tac = { optional=true, version="0.0.6", package="uu_tac", path="src/uu/tac" } -tail = { optional=true, version="0.0.6", package="uu_tail", path="src/uu/tail" } -tee = { optional=true, version="0.0.6", package="uu_tee", path="src/uu/tee" } -timeout = { optional=true, version="0.0.6", package="uu_timeout", path="src/uu/timeout" } -touch = { optional=true, version="0.0.6", package="uu_touch", path="src/uu/touch" } -tr = { optional=true, version="0.0.6", package="uu_tr", path="src/uu/tr" } -true = { optional=true, version="0.0.6", package="uu_true", path="src/uu/true" } -truncate = { optional=true, version="0.0.6", package="uu_truncate", path="src/uu/truncate" } -tsort = { optional=true, version="0.0.6", package="uu_tsort", path="src/uu/tsort" } -tty = { optional=true, version="0.0.6", package="uu_tty", path="src/uu/tty" } -uname = { optional=true, version="0.0.6", package="uu_uname", path="src/uu/uname" } -unexpand = { optional=true, version="0.0.6", package="uu_unexpand", path="src/uu/unexpand" } -uniq = { optional=true, version="0.0.6", package="uu_uniq", path="src/uu/uniq" } -unlink = { optional=true, version="0.0.6", package="uu_unlink", path="src/uu/unlink" } -uptime = { optional=true, version="0.0.6", package="uu_uptime", path="src/uu/uptime" } -users = { optional=true, version="0.0.6", package="uu_users", path="src/uu/users" } -wc = { optional=true, version="0.0.6", package="uu_wc", path="src/uu/wc" } -who = { optional=true, version="0.0.6", package="uu_who", path="src/uu/who" } -whoami = { optional=true, version="0.0.6", package="uu_whoami", path="src/uu/whoami" } -yes = { optional=true, version="0.0.6", package="uu_yes", path="src/uu/yes" } +arch = { optional=true, version="0.0.7", package="uu_arch", path="src/uu/arch" } +base32 = { optional=true, version="0.0.7", package="uu_base32", path="src/uu/base32" } +base64 = { optional=true, version="0.0.7", package="uu_base64", path="src/uu/base64" } +basename = { optional=true, version="0.0.7", package="uu_basename", path="src/uu/basename" } +cat = { optional=true, version="0.0.7", package="uu_cat", path="src/uu/cat" } +chgrp = { optional=true, version="0.0.7", package="uu_chgrp", path="src/uu/chgrp" } +chmod = { optional=true, version="0.0.7", package="uu_chmod", path="src/uu/chmod" } +chown = { optional=true, version="0.0.7", package="uu_chown", path="src/uu/chown" } +chroot = { optional=true, version="0.0.7", package="uu_chroot", path="src/uu/chroot" } +cksum = { optional=true, version="0.0.7", package="uu_cksum", path="src/uu/cksum" } +comm = { optional=true, version="0.0.7", package="uu_comm", path="src/uu/comm" } +cp = { optional=true, version="0.0.7", package="uu_cp", path="src/uu/cp" } +csplit = { optional=true, version="0.0.7", package="uu_csplit", path="src/uu/csplit" } +cut = { optional=true, version="0.0.7", package="uu_cut", path="src/uu/cut" } +date = { optional=true, version="0.0.7", package="uu_date", path="src/uu/date" } +dd = { optional=true, version="0.0.7", package="uu_dd", path="src/uu/dd" } +df = { optional=true, version="0.0.7", package="uu_df", path="src/uu/df" } +dircolors= { optional=true, version="0.0.7", package="uu_dircolors", path="src/uu/dircolors" } +dirname = { optional=true, version="0.0.7", package="uu_dirname", path="src/uu/dirname" } +du = { optional=true, version="0.0.7", package="uu_du", path="src/uu/du" } +echo = { optional=true, version="0.0.7", package="uu_echo", path="src/uu/echo" } +env = { optional=true, version="0.0.7", package="uu_env", path="src/uu/env" } +expand = { optional=true, version="0.0.7", package="uu_expand", path="src/uu/expand" } +expr = { optional=true, version="0.0.7", package="uu_expr", path="src/uu/expr" } +factor = { optional=true, version="0.0.7", package="uu_factor", path="src/uu/factor" } +false = { optional=true, version="0.0.7", package="uu_false", path="src/uu/false" } +fmt = { optional=true, version="0.0.7", package="uu_fmt", path="src/uu/fmt" } +fold = { optional=true, version="0.0.7", package="uu_fold", path="src/uu/fold" } +groups = { optional=true, version="0.0.7", package="uu_groups", path="src/uu/groups" } +hashsum = { optional=true, version="0.0.7", package="uu_hashsum", path="src/uu/hashsum" } +head = { optional=true, version="0.0.7", package="uu_head", path="src/uu/head" } +hostid = { optional=true, version="0.0.7", package="uu_hostid", path="src/uu/hostid" } +hostname = { optional=true, version="0.0.7", package="uu_hostname", path="src/uu/hostname" } +id = { optional=true, version="0.0.7", package="uu_id", path="src/uu/id" } +install = { optional=true, version="0.0.7", package="uu_install", path="src/uu/install" } +join = { optional=true, version="0.0.7", package="uu_join", path="src/uu/join" } +kill = { optional=true, version="0.0.7", package="uu_kill", path="src/uu/kill" } +link = { optional=true, version="0.0.7", package="uu_link", path="src/uu/link" } +ln = { optional=true, version="0.0.7", package="uu_ln", path="src/uu/ln" } +ls = { optional=true, version="0.0.7", package="uu_ls", path="src/uu/ls" } +logname = { optional=true, version="0.0.7", package="uu_logname", path="src/uu/logname" } +mkdir = { optional=true, version="0.0.7", package="uu_mkdir", path="src/uu/mkdir" } +mkfifo = { optional=true, version="0.0.7", package="uu_mkfifo", path="src/uu/mkfifo" } +mknod = { optional=true, version="0.0.7", package="uu_mknod", path="src/uu/mknod" } +mktemp = { optional=true, version="0.0.7", package="uu_mktemp", path="src/uu/mktemp" } +more = { optional=true, version="0.0.7", package="uu_more", path="src/uu/more" } +mv = { optional=true, version="0.0.7", package="uu_mv", path="src/uu/mv" } +nice = { optional=true, version="0.0.7", package="uu_nice", path="src/uu/nice" } +nl = { optional=true, version="0.0.7", package="uu_nl", path="src/uu/nl" } +nohup = { optional=true, version="0.0.7", package="uu_nohup", path="src/uu/nohup" } +nproc = { optional=true, version="0.0.7", package="uu_nproc", path="src/uu/nproc" } +numfmt = { optional=true, version="0.0.7", package="uu_numfmt", path="src/uu/numfmt" } +od = { optional=true, version="0.0.7", package="uu_od", path="src/uu/od" } +paste = { optional=true, version="0.0.7", package="uu_paste", path="src/uu/paste" } +pathchk = { optional=true, version="0.0.7", package="uu_pathchk", path="src/uu/pathchk" } +pinky = { optional=true, version="0.0.7", package="uu_pinky", path="src/uu/pinky" } +pr = { optional=true, version="0.0.7", package="uu_pr", path="src/uu/pr" } +printenv = { optional=true, version="0.0.7", package="uu_printenv", path="src/uu/printenv" } +printf = { optional=true, version="0.0.7", package="uu_printf", path="src/uu/printf" } +ptx = { optional=true, version="0.0.7", package="uu_ptx", path="src/uu/ptx" } +pwd = { optional=true, version="0.0.7", package="uu_pwd", path="src/uu/pwd" } +readlink = { optional=true, version="0.0.7", package="uu_readlink", path="src/uu/readlink" } +realpath = { optional=true, version="0.0.7", package="uu_realpath", path="src/uu/realpath" } +relpath = { optional=true, version="0.0.7", package="uu_relpath", path="src/uu/relpath" } +rm = { optional=true, version="0.0.7", package="uu_rm", path="src/uu/rm" } +rmdir = { optional=true, version="0.0.7", package="uu_rmdir", path="src/uu/rmdir" } +seq = { optional=true, version="0.0.7", package="uu_seq", path="src/uu/seq" } +shred = { optional=true, version="0.0.7", package="uu_shred", path="src/uu/shred" } +shuf = { optional=true, version="0.0.7", package="uu_shuf", path="src/uu/shuf" } +sleep = { optional=true, version="0.0.7", package="uu_sleep", path="src/uu/sleep" } +sort = { optional=true, version="0.0.7", package="uu_sort", path="src/uu/sort" } +split = { optional=true, version="0.0.7", package="uu_split", path="src/uu/split" } +stat = { optional=true, version="0.0.7", package="uu_stat", path="src/uu/stat" } +stdbuf = { optional=true, version="0.0.7", package="uu_stdbuf", path="src/uu/stdbuf" } +sum = { optional=true, version="0.0.7", package="uu_sum", path="src/uu/sum" } +sync = { optional=true, version="0.0.7", package="uu_sync", path="src/uu/sync" } +tac = { optional=true, version="0.0.7", package="uu_tac", path="src/uu/tac" } +tail = { optional=true, version="0.0.7", package="uu_tail", path="src/uu/tail" } +tee = { optional=true, version="0.0.7", package="uu_tee", path="src/uu/tee" } +timeout = { optional=true, version="0.0.7", package="uu_timeout", path="src/uu/timeout" } +touch = { optional=true, version="0.0.7", package="uu_touch", path="src/uu/touch" } +tr = { optional=true, version="0.0.7", package="uu_tr", path="src/uu/tr" } +true = { optional=true, version="0.0.7", package="uu_true", path="src/uu/true" } +truncate = { optional=true, version="0.0.7", package="uu_truncate", path="src/uu/truncate" } +tsort = { optional=true, version="0.0.7", package="uu_tsort", path="src/uu/tsort" } +tty = { optional=true, version="0.0.7", package="uu_tty", path="src/uu/tty" } +uname = { optional=true, version="0.0.7", package="uu_uname", path="src/uu/uname" } +unexpand = { optional=true, version="0.0.7", package="uu_unexpand", path="src/uu/unexpand" } +uniq = { optional=true, version="0.0.7", package="uu_uniq", path="src/uu/uniq" } +unlink = { optional=true, version="0.0.7", package="uu_unlink", path="src/uu/unlink" } +uptime = { optional=true, version="0.0.7", package="uu_uptime", path="src/uu/uptime" } +users = { optional=true, version="0.0.7", package="uu_users", path="src/uu/users" } +wc = { optional=true, version="0.0.7", package="uu_wc", path="src/uu/wc" } +who = { optional=true, version="0.0.7", package="uu_who", path="src/uu/who" } +whoami = { optional=true, version="0.0.7", package="uu_whoami", path="src/uu/whoami" } +yes = { optional=true, version="0.0.7", package="uu_yes", path="src/uu/yes" } # this breaks clippy linting with: "tests/by-util/test_factor_benches.rs: No such file or directory (os error 2)" # factor_benches = { optional = true, version = "0.0.0", package = "uu_factor_benches", path = "tests/benches/factor" } @@ -352,7 +352,7 @@ sha1 = { version="0.6", features=["std"] } tempfile = "3.2.0" time = "0.1" unindent = "0.1" -uucore = { version=">=0.0.8", package="uucore", path="src/uucore", features=["entries", "process"] } +uucore = { version=">=0.0.9", package="uucore", path="src/uucore", features=["entries", "process"] } walkdir = "2.2" atty = "0.2" diff --git a/GNUmakefile b/GNUmakefile index bb82925ec..996c568f3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -307,7 +307,7 @@ ifeq (${MULTICALL}, y) $(INSTALL) $(BUILDDIR)/coreutils $(INSTALLDIR_BIN)/$(PROG_PREFIX)coreutils cd $(INSTALLDIR_BIN) && $(foreach prog, $(filter-out coreutils, $(INSTALLEES)), \ ln -fs $(PROG_PREFIX)coreutils $(PROG_PREFIX)$(prog) &&) : - $(if $(findstring test,$(INSTALLEES)), ln -fs $(PROG_PREFIX)coreutils $(PROG_PREFIX)[) + $(if $(findstring test,$(INSTALLEES)), cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)coreutils $(PROG_PREFIX)[) cat $(DOCSDIR)/_build/man/coreutils.1 | gzip > $(INSTALLDIR_MAN)/$(PROG_PREFIX)coreutils.1.gz else $(foreach prog, $(INSTALLEES), \ @@ -316,6 +316,9 @@ else endif $(foreach man, $(filter $(INSTALLEES), $(basename $(notdir $(wildcard $(DOCSDIR)/_build/man/*)))), \ cat $(DOCSDIR)/_build/man/$(man).1 | gzip > $(INSTALLDIR_MAN)/$(PROG_PREFIX)$(man).1.gz &&) : + mkdir -p $(DESTDIR)$(PREFIX)/share/zsh/site-functions + mkdir -p $(DESTDIR)$(PREFIX)/share/bash-completion/completions + mkdir -p $(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d $(foreach prog, $(INSTALLEES), \ $(BUILDDIR)/coreutils completion $(prog) zsh > $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(PROG_PREFIX)$(prog); \ $(BUILDDIR)/coreutils completion $(prog) bash > $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$(PROG_PREFIX)$(prog); \ diff --git a/src/uu/arch/Cargo.toml b/src/uu/arch/Cargo.toml index 855b577d6..aa51183d7 100644 --- a/src/uu/arch/Cargo.toml +++ b/src/uu/arch/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_arch" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "arch ~ (uutils) display machine architecture" @@ -17,8 +17,8 @@ path = "src/arch.rs" [dependencies] platform-info = "0.1" clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "arch" diff --git a/src/uu/base32/Cargo.toml b/src/uu/base32/Cargo.toml index a024c49db..3f6f79a0b 100644 --- a/src/uu/base32/Cargo.toml +++ b/src/uu/base32/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_base32" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "base32 ~ (uutils) decode/encode input (base32-encoding)" @@ -16,8 +16,8 @@ path = "src/base32.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features = ["encoding"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features = ["encoding"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "base32" diff --git a/src/uu/base64/Cargo.toml b/src/uu/base64/Cargo.toml index 202c6511b..ff5a9aa48 100644 --- a/src/uu/base64/Cargo.toml +++ b/src/uu/base64/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_base64" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "base64 ~ (uutils) decode/encode input (base64-encoding)" @@ -16,8 +16,8 @@ path = "src/base64.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features = ["encoding"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features = ["encoding"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } uu_base32 = { version=">=0.0.6", package="uu_base32", path="../base32"} [[bin]] diff --git a/src/uu/basename/Cargo.toml b/src/uu/basename/Cargo.toml index 9912dfd87..b5270eba9 100644 --- a/src/uu/basename/Cargo.toml +++ b/src/uu/basename/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_basename" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "basename ~ (uutils) display PATHNAME with leading directory components removed" @@ -16,8 +16,8 @@ path = "src/basename.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "basename" diff --git a/src/uu/cat/Cargo.toml b/src/uu/cat/Cargo.toml index f20cddcf9..b0721cee0 100644 --- a/src/uu/cat/Cargo.toml +++ b/src/uu/cat/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_cat" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "cat ~ (uutils) concatenate and display input" @@ -18,8 +18,8 @@ path = "src/cat.rs" clap = { version = "2.33", features = ["wrap_help"] } thiserror = "1.0" atty = "0.2" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [target.'cfg(unix)'.dependencies] unix_socket = "0.5.0" diff --git a/src/uu/chgrp/Cargo.toml b/src/uu/chgrp/Cargo.toml index 619bdaaad..5a2591f56 100644 --- a/src/uu/chgrp/Cargo.toml +++ b/src/uu/chgrp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_chgrp" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "chgrp ~ (uutils) change the group ownership of FILE" @@ -16,8 +16,8 @@ path = "src/chgrp.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } walkdir = "2.2" [[bin]] diff --git a/src/uu/chmod/Cargo.toml b/src/uu/chmod/Cargo.toml index c523829f3..df150e0ed 100644 --- a/src/uu/chmod/Cargo.toml +++ b/src/uu/chmod/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_chmod" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "chmod ~ (uutils) change mode of FILE" @@ -17,8 +17,8 @@ path = "src/chmod.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs", "mode"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs", "mode"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } walkdir = "2.2" [[bin]] diff --git a/src/uu/chown/Cargo.toml b/src/uu/chown/Cargo.toml index f19ed39a8..828c214be 100644 --- a/src/uu/chown/Cargo.toml +++ b/src/uu/chown/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_chown" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "chown ~ (uutils) change the ownership of FILE" @@ -17,8 +17,8 @@ path = "src/chown.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } glob = "0.3.0" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs", "perms"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } walkdir = "2.2" [[bin]] diff --git a/src/uu/chroot/Cargo.toml b/src/uu/chroot/Cargo.toml index bf1e0ef59..a808a717b 100644 --- a/src/uu/chroot/Cargo.toml +++ b/src/uu/chroot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_chroot" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "chroot ~ (uutils) run COMMAND under a new root directory" @@ -16,8 +16,8 @@ path = "src/chroot.rs" [dependencies] clap= "2.33" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "chroot" diff --git a/src/uu/cksum/Cargo.toml b/src/uu/cksum/Cargo.toml index 792c6c0c7..b92b680c8 100644 --- a/src/uu/cksum/Cargo.toml +++ b/src/uu/cksum/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_cksum" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "cksum ~ (uutils) display CRC and size of input" @@ -17,8 +17,8 @@ path = "src/cksum.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "cksum" diff --git a/src/uu/comm/Cargo.toml b/src/uu/comm/Cargo.toml index b1f8948e7..1deb094e2 100644 --- a/src/uu/comm/Cargo.toml +++ b/src/uu/comm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_comm" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "comm ~ (uutils) compare sorted inputs" @@ -17,8 +17,8 @@ path = "src/comm.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "comm" diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml index 76990863d..b7b3809a7 100644 --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_cp" -version = "0.0.6" +version = "0.0.7" authors = [ "Jordy Dickinson ", "Joshua S. Miller ", @@ -23,8 +23,8 @@ clap = { version = "2.33", features = ["wrap_help"] } filetime = "0.2" libc = "0.2.85" quick-error = "1.2.3" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } walkdir = "2.2" [target.'cfg(target_os = "linux")'.dependencies] diff --git a/src/uu/csplit/Cargo.toml b/src/uu/csplit/Cargo.toml index 48655316f..2ddc3b89c 100644 --- a/src/uu/csplit/Cargo.toml +++ b/src/uu/csplit/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_csplit" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "csplit ~ (uutils) Output pieces of FILE separated by PATTERN(s) to files 'xx00', 'xx01', ..., and output byte counts of each piece to standard output" @@ -19,8 +19,8 @@ clap = { version = "2.33", features = ["wrap_help"] } thiserror = "1.0" regex = "1.0.0" glob = "0.2.11" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "csplit" diff --git a/src/uu/cut/Cargo.toml b/src/uu/cut/Cargo.toml index 9a83ff554..6f92b39d1 100644 --- a/src/uu/cut/Cargo.toml +++ b/src/uu/cut/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_cut" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "cut ~ (uutils) display byte/field columns of input lines" @@ -16,8 +16,8 @@ path = "src/cut.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } memchr = "2" bstr = "0.2" atty = "0.2" diff --git a/src/uu/date/Cargo.toml b/src/uu/date/Cargo.toml index 3751e071e..c144d0d81 100644 --- a/src/uu/date/Cargo.toml +++ b/src/uu/date/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_date" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "date ~ (uutils) display or set the current time" @@ -17,8 +17,8 @@ path = "src/date.rs" [dependencies] chrono = "0.4.4" clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [target.'cfg(unix)'.dependencies] libc = "0.2" diff --git a/src/uu/df/Cargo.toml b/src/uu/df/Cargo.toml index 4700d419a..6979a79b4 100644 --- a/src/uu/df/Cargo.toml +++ b/src/uu/df/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_df" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "df ~ (uutils) display file system information" @@ -17,8 +17,8 @@ path = "src/df.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } number_prefix = "0.4" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["libc", "fsext"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc", "fsext"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "df" diff --git a/src/uu/dircolors/Cargo.toml b/src/uu/dircolors/Cargo.toml index a97c78c78..e9e333ec6 100644 --- a/src/uu/dircolors/Cargo.toml +++ b/src/uu/dircolors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_dircolors" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "dircolors ~ (uutils) display commands to set LS_COLORS" @@ -17,8 +17,8 @@ path = "src/dircolors.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } glob = "0.3.0" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "dircolors" diff --git a/src/uu/dirname/Cargo.toml b/src/uu/dirname/Cargo.toml index 2375d66c9..bd9e449d7 100644 --- a/src/uu/dirname/Cargo.toml +++ b/src/uu/dirname/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_dirname" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "dirname ~ (uutils) display parent directory of PATHNAME" @@ -17,8 +17,8 @@ path = "src/dirname.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "dirname" diff --git a/src/uu/du/Cargo.toml b/src/uu/du/Cargo.toml index 60f37db06..dfc50f7a6 100644 --- a/src/uu/du/Cargo.toml +++ b/src/uu/du/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_du" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "du ~ (uutils) display disk usage" @@ -17,8 +17,8 @@ path = "src/du.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } chrono = "0.4" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [target.'cfg(target_os = "windows")'.dependencies] winapi = { version="0.3", features=[] } diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index 437668947..61a3b8c29 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -5,6 +5,9 @@ // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. +// Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422 +#![allow(clippy::nonstandard_macro_braces)] + #[macro_use] extern crate uucore; @@ -416,26 +419,22 @@ impl Display for DuError { DuError::SummarizeDepthConflict(s) => { write!(f, "summarizing conflicts with --max-depth={}", s) } - DuError::InvalidTimeStyleArg(s) => { - write!( - f, - "invalid argument '{}' for 'time style' + DuError::InvalidTimeStyleArg(s) => write!( + f, + "invalid argument '{}' for 'time style' Valid arguments are: - 'full-iso' - 'long-iso' - 'iso' Try '{} --help' for more information.", - s, NAME - ) - } - DuError::InvalidTimeArg(s) => { - write!( - f, - "Invalid argument '{}' for --time. + s, NAME + ), + DuError::InvalidTimeArg(s) => write!( + f, + "Invalid argument '{}' for --time. 'birth' and 'creation' arguments are not supported on this platform.", - s - ) - } + s + ), } } } diff --git a/src/uu/echo/Cargo.toml b/src/uu/echo/Cargo.toml index 5ba44d4a8..60a547e21 100644 --- a/src/uu/echo/Cargo.toml +++ b/src/uu/echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_echo" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "echo ~ (uutils) display TEXT" @@ -16,8 +16,8 @@ path = "src/echo.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "echo" diff --git a/src/uu/env/Cargo.toml b/src/uu/env/Cargo.toml index 7cbd812c2..9f778aa3f 100644 --- a/src/uu/env/Cargo.toml +++ b/src/uu/env/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_env" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "env ~ (uutils) set each NAME to VALUE in the environment and run COMMAND" @@ -18,8 +18,8 @@ path = "src/env.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" rust-ini = "0.13.0" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "env" diff --git a/src/uu/expand/Cargo.toml b/src/uu/expand/Cargo.toml index 2119897b4..5921ef679 100644 --- a/src/uu/expand/Cargo.toml +++ b/src/uu/expand/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_expand" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "expand ~ (uutils) convert input tabs to spaces" @@ -17,8 +17,8 @@ path = "src/expand.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } unicode-width = "0.1.5" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "expand" diff --git a/src/uu/expr/Cargo.toml b/src/uu/expr/Cargo.toml index 4211a2d25..65d4fa636 100644 --- a/src/uu/expr/Cargo.toml +++ b/src/uu/expr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_expr" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "expr ~ (uutils) display the value of EXPRESSION" @@ -20,8 +20,8 @@ libc = "0.2.42" num-bigint = "0.4.0" num-traits = "0.2.14" onig = "~4.3.2" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "expr" diff --git a/src/uu/factor/Cargo.toml b/src/uu/factor/Cargo.toml index c9cfe78ab..76c06a34c 100644 --- a/src/uu/factor/Cargo.toml +++ b/src/uu/factor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_factor" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "factor ~ (uutils) display the prime factors of each NUMBER" @@ -20,7 +20,7 @@ num-traits = "0.2.13" # Needs at least version 0.2.13 for "OverflowingAdd" rand = { version = "0.7", features = ["small_rng"] } smallvec = { version = "0.6.14, < 1.0" } uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore" } -uucore_procs = { version = ">=0.0.5", package = "uucore_procs", path = "../../uucore_procs" } +uucore_procs = { version=">=0.0.6", package = "uucore_procs", path = "../../uucore_procs" } clap = { version = "2.33", features = ["wrap_help"] } [dev-dependencies] diff --git a/src/uu/false/Cargo.toml b/src/uu/false/Cargo.toml index 93913b7e2..d6b4b7d6d 100644 --- a/src/uu/false/Cargo.toml +++ b/src/uu/false/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_false" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "false ~ (uutils) do nothing and fail" @@ -16,8 +16,8 @@ path = "src/false.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "false" diff --git a/src/uu/fmt/Cargo.toml b/src/uu/fmt/Cargo.toml index fdb1f8ca4..dea0726a6 100644 --- a/src/uu/fmt/Cargo.toml +++ b/src/uu/fmt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_fmt" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "fmt ~ (uutils) reformat each paragraph of input" @@ -18,8 +18,8 @@ path = "src/fmt.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" unicode-width = "0.1.5" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "fmt" diff --git a/src/uu/fold/Cargo.toml b/src/uu/fold/Cargo.toml index 50ed34388..446be290d 100644 --- a/src/uu/fold/Cargo.toml +++ b/src/uu/fold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_fold" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "fold ~ (uutils) wrap each line of input" @@ -16,8 +16,8 @@ path = "src/fold.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "fold" diff --git a/src/uu/groups/Cargo.toml b/src/uu/groups/Cargo.toml index 14ee44d18..c32153f17 100644 --- a/src/uu/groups/Cargo.toml +++ b/src/uu/groups/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_groups" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "groups ~ (uutils) display group memberships for USERNAME" @@ -15,8 +15,8 @@ edition = "2018" path = "src/groups.rs" [dependencies] -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "process"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "process"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } clap = { version = "2.33", features = ["wrap_help"] } [[bin]] diff --git a/src/uu/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml index 87a2b8aa1..43d78119b 100644 --- a/src/uu/hashsum/Cargo.toml +++ b/src/uu/hashsum/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_hashsum" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "hashsum ~ (uutils) display or check input digests" @@ -26,8 +26,8 @@ sha1 = "0.6.0" sha2 = "0.6.0" sha3 = "0.6.0" blake2b_simd = "0.5.11" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "hashsum" diff --git a/src/uu/head/Cargo.toml b/src/uu/head/Cargo.toml index a0f1f9d95..1019ac74f 100644 --- a/src/uu/head/Cargo.toml +++ b/src/uu/head/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_head" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "head ~ (uutils) display the first lines of input" @@ -16,8 +16,8 @@ path = "src/head.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["ringbuffer"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["ringbuffer"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "head" diff --git a/src/uu/hostid/Cargo.toml b/src/uu/hostid/Cargo.toml index 95e20db68..45ced472f 100644 --- a/src/uu/hostid/Cargo.toml +++ b/src/uu/hostid/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_hostid" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "hostid ~ (uutils) display the numeric identifier of the current host" @@ -17,8 +17,8 @@ path = "src/hostid.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "hostid" diff --git a/src/uu/hostname/Cargo.toml b/src/uu/hostname/Cargo.toml index e4d78441c..afd402f24 100644 --- a/src/uu/hostname/Cargo.toml +++ b/src/uu/hostname/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_hostname" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "hostname ~ (uutils) display or set the host name of the current host" @@ -18,8 +18,8 @@ path = "src/hostname.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" hostname = { version = "0.3", features = ["set"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["wide"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["wide"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } winapi = { version="0.3", features=["sysinfoapi", "winsock2"] } [[bin]] diff --git a/src/uu/id/Cargo.toml b/src/uu/id/Cargo.toml index 97f478ef9..367fb553c 100644 --- a/src/uu/id/Cargo.toml +++ b/src/uu/id/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_id" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "id ~ (uutils) display user and group information for USER" @@ -16,8 +16,8 @@ path = "src/id.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "process"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "process"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "id" diff --git a/src/uu/install/Cargo.toml b/src/uu/install/Cargo.toml index 5beef2b29..d930b2fbd 100644 --- a/src/uu/install/Cargo.toml +++ b/src/uu/install/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_install" -version = "0.0.6" +version = "0.0.7" authors = [ "Ben Eills ", "uutils developers", @@ -22,8 +22,8 @@ clap = { version = "2.33", features = ["wrap_help"] } filetime = "0.2" file_diff = "1.0.0" libc = ">= 0.2" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["mode", "perms", "entries"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["mode", "perms", "entries"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [dev-dependencies] time = "0.1.40" diff --git a/src/uu/join/Cargo.toml b/src/uu/join/Cargo.toml index 21284a6c3..f108d5a4e 100644 --- a/src/uu/join/Cargo.toml +++ b/src/uu/join/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_join" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "join ~ (uutils) merge lines from inputs with matching join fields" @@ -16,8 +16,8 @@ path = "src/join.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "join" diff --git a/src/uu/kill/Cargo.toml b/src/uu/kill/Cargo.toml index c3a5368d9..82a8a4fd0 100644 --- a/src/uu/kill/Cargo.toml +++ b/src/uu/kill/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_kill" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "kill ~ (uutils) send a signal to a process" @@ -17,8 +17,8 @@ path = "src/kill.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["signals"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["signals"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "kill" diff --git a/src/uu/link/Cargo.toml b/src/uu/link/Cargo.toml index 0457ec479..025ac7554 100644 --- a/src/uu/link/Cargo.toml +++ b/src/uu/link/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_link" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "link ~ (uutils) create a hard (file system) link to FILE" @@ -16,8 +16,8 @@ path = "src/link.rs" [dependencies] libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } clap = { version = "2.33", features = ["wrap_help"] } [[bin]] diff --git a/src/uu/ln/Cargo.toml b/src/uu/ln/Cargo.toml index 4386d7522..476e13771 100644 --- a/src/uu/ln/Cargo.toml +++ b/src/uu/ln/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_ln" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "ln ~ (uutils) create a (file system) link to TARGET" @@ -17,8 +17,8 @@ path = "src/ln.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "ln" diff --git a/src/uu/logname/Cargo.toml b/src/uu/logname/Cargo.toml index 2a541073f..3c5f9afab 100644 --- a/src/uu/logname/Cargo.toml +++ b/src/uu/logname/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_logname" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "logname ~ (uutils) display the login name of the current user" @@ -17,8 +17,8 @@ path = "src/logname.rs" [dependencies] libc = "0.2.42" clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "logname" diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml index ecd4f1b8d..dbe6bacaa 100644 --- a/src/uu/ls/Cargo.toml +++ b/src/uu/ls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_ls" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "ls ~ (uutils) display directory contents" @@ -25,7 +25,7 @@ termsize = "0.1.6" globset = "0.4.6" lscolors = { version = "0.7.1", features = ["ansi_term"] } uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore", features = ["entries", "fs"] } -uucore_procs = { version = ">=0.0.5", package = "uucore_procs", path = "../../uucore_procs" } +uucore_procs = { version=">=0.0.6", package = "uucore_procs", path = "../../uucore_procs" } once_cell = "1.7.2" atty = "0.2" diff --git a/src/uu/mkdir/Cargo.toml b/src/uu/mkdir/Cargo.toml index ad7972f2d..011d70af0 100644 --- a/src/uu/mkdir/Cargo.toml +++ b/src/uu/mkdir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_mkdir" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "mkdir ~ (uutils) create DIRECTORY" @@ -17,8 +17,8 @@ path = "src/mkdir.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs", "mode"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs", "mode"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "mkdir" diff --git a/src/uu/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml index 5a78183ea..01d6bad64 100644 --- a/src/uu/mkfifo/Cargo.toml +++ b/src/uu/mkfifo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_mkfifo" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "mkfifo ~ (uutils) create FIFOs (named pipes)" @@ -17,8 +17,8 @@ path = "src/mkfifo.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "mkfifo" diff --git a/src/uu/mknod/Cargo.toml b/src/uu/mknod/Cargo.toml index c7ba535fd..e6073d50c 100644 --- a/src/uu/mknod/Cargo.toml +++ b/src/uu/mknod/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_mknod" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "mknod ~ (uutils) create special file NAME of TYPE" @@ -18,8 +18,8 @@ path = "src/mknod.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "^0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["mode"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["mode"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "mknod" diff --git a/src/uu/mktemp/Cargo.toml b/src/uu/mktemp/Cargo.toml index 93fb88857..4c9a8d29c 100644 --- a/src/uu/mktemp/Cargo.toml +++ b/src/uu/mktemp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_mktemp" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "mktemp ~ (uutils) create and display a temporary file or directory from TEMPLATE" @@ -18,8 +18,8 @@ path = "src/mktemp.rs" clap = { version = "2.33", features = ["wrap_help"] } rand = "0.5" tempfile = "3.1" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "mktemp" diff --git a/src/uu/more/Cargo.toml b/src/uu/more/Cargo.toml index 497f91f4e..03866d187 100644 --- a/src/uu/more/Cargo.toml +++ b/src/uu/more/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_more" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "more ~ (uutils) input perusal filter" @@ -17,7 +17,7 @@ path = "src/more.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } uucore = { version = ">=0.0.7", package = "uucore", path = "../../uucore" } -uucore_procs = { version = ">=0.0.5", package = "uucore_procs", path = "../../uucore_procs" } +uucore_procs = { version=">=0.0.6", package = "uucore_procs", path = "../../uucore_procs" } crossterm = ">=0.19" atty = "0.2" unicode-width = "0.1.7" diff --git a/src/uu/mv/Cargo.toml b/src/uu/mv/Cargo.toml index 94d3de15e..9af0cb2a3 100644 --- a/src/uu/mv/Cargo.toml +++ b/src/uu/mv/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_mv" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "mv ~ (uutils) move (rename) SOURCE to DESTINATION" @@ -17,8 +17,8 @@ path = "src/mv.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } fs_extra = "1.1.0" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "mv" diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml index eed524b8a..31c310790 100644 --- a/src/uu/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_nice" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "nice ~ (uutils) run PROGRAM with modified scheduling priority" @@ -18,8 +18,8 @@ path = "src/nice.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" nix = { version="<=0.13" } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "nice" diff --git a/src/uu/nl/Cargo.toml b/src/uu/nl/Cargo.toml index 4197bfd8e..57676768f 100644 --- a/src/uu/nl/Cargo.toml +++ b/src/uu/nl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_nl" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "nl ~ (uutils) display input with added line numbers" @@ -21,8 +21,8 @@ libc = "0.2.42" memchr = "2.2.0" regex = "1.0.1" regex-syntax = "0.6.7" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "nl" diff --git a/src/uu/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml index f7166a4b6..d7de60b0b 100644 --- a/src/uu/nohup/Cargo.toml +++ b/src/uu/nohup/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_nohup" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "nohup ~ (uutils) run COMMAND, ignoring hangup signals" @@ -18,8 +18,8 @@ path = "src/nohup.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" atty = "0.2" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "nohup" diff --git a/src/uu/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml index a4eec07eb..e02bec7e1 100644 --- a/src/uu/nproc/Cargo.toml +++ b/src/uu/nproc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_nproc" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "nproc ~ (uutils) display the number of processing units available" @@ -18,8 +18,8 @@ path = "src/nproc.rs" libc = "0.2.42" num_cpus = "1.10" clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "nproc" diff --git a/src/uu/numfmt/Cargo.toml b/src/uu/numfmt/Cargo.toml index 7a81e36d6..a3bdcf261 100644 --- a/src/uu/numfmt/Cargo.toml +++ b/src/uu/numfmt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_numfmt" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "numfmt ~ (uutils) reformat NUMBER" @@ -16,8 +16,8 @@ path = "src/numfmt.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "numfmt" diff --git a/src/uu/od/Cargo.toml b/src/uu/od/Cargo.toml index 24da14b31..804183025 100644 --- a/src/uu/od/Cargo.toml +++ b/src/uu/od/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_od" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "od ~ (uutils) display formatted representation of input" @@ -19,8 +19,8 @@ byteorder = "1.3.2" clap = { version = "2.33", features = ["wrap_help"] } half = "1.6" libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "od" diff --git a/src/uu/paste/Cargo.toml b/src/uu/paste/Cargo.toml index cfc70a3bd..19a674c3e 100644 --- a/src/uu/paste/Cargo.toml +++ b/src/uu/paste/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_paste" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "paste ~ (uutils) merge lines from inputs" @@ -16,8 +16,8 @@ path = "src/paste.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "paste" diff --git a/src/uu/pathchk/Cargo.toml b/src/uu/pathchk/Cargo.toml index c39eb6e16..d7e76728a 100644 --- a/src/uu/pathchk/Cargo.toml +++ b/src/uu/pathchk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_pathchk" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "pathchk ~ (uutils) diagnose invalid or non-portable PATHNAME" @@ -17,8 +17,8 @@ path = "src/pathchk.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "pathchk" diff --git a/src/uu/pinky/Cargo.toml b/src/uu/pinky/Cargo.toml index 2cdb28d92..a84aa7473 100644 --- a/src/uu/pinky/Cargo.toml +++ b/src/uu/pinky/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_pinky" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "pinky ~ (uutils) display user information" @@ -15,8 +15,8 @@ edition = "2018" path = "src/pinky.rs" [dependencies] -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["utmpx", "entries"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["utmpx", "entries"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } clap = { version = "2.33", features = ["wrap_help"] } [[bin]] diff --git a/src/uu/pr/Cargo.toml b/src/uu/pr/Cargo.toml index 122bed694..3028e7f6a 100644 --- a/src/uu/pr/Cargo.toml +++ b/src/uu/pr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_pr" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "pr ~ (uutils) convert text files for printing" @@ -17,7 +17,7 @@ path = "src/pr.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } uucore = { version=">=0.0.7", package="uucore", path="../../uucore", features=["utmpx", "entries"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } getopts = "0.2.21" time = "0.1.41" # A higher version would cause a conflict with time diff --git a/src/uu/printenv/Cargo.toml b/src/uu/printenv/Cargo.toml index faa24a33b..040997393 100644 --- a/src/uu/printenv/Cargo.toml +++ b/src/uu/printenv/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_printenv" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "printenv ~ (uutils) display value of environment VAR" @@ -16,8 +16,8 @@ path = "src/printenv.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "printenv" diff --git a/src/uu/printf/Cargo.toml b/src/uu/printf/Cargo.toml index f980837e7..a0bd27d8e 100644 --- a/src/uu/printf/Cargo.toml +++ b/src/uu/printf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_printf" -version = "0.0.6" +version = "0.0.7" authors = [ "Nathan Ross", "uutils developers", @@ -20,8 +20,8 @@ path = "src/printf.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } itertools = "0.8.0" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "printf" diff --git a/src/uu/ptx/Cargo.toml b/src/uu/ptx/Cargo.toml index 1ccdd9ad4..852379e15 100644 --- a/src/uu/ptx/Cargo.toml +++ b/src/uu/ptx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_ptx" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "ptx ~ (uutils) display a permuted index of input" @@ -21,8 +21,8 @@ libc = "0.2.42" memchr = "2.2.0" regex = "1.0.1" regex-syntax = "0.6.7" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "ptx" diff --git a/src/uu/pwd/Cargo.toml b/src/uu/pwd/Cargo.toml index 3393a63b3..37cbc7fe6 100644 --- a/src/uu/pwd/Cargo.toml +++ b/src/uu/pwd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_pwd" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "pwd ~ (uutils) display current working directory" @@ -16,8 +16,8 @@ path = "src/pwd.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "pwd" diff --git a/src/uu/readlink/Cargo.toml b/src/uu/readlink/Cargo.toml index 65b5c149b..9e0f939d1 100644 --- a/src/uu/readlink/Cargo.toml +++ b/src/uu/readlink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_readlink" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "readlink ~ (uutils) display resolved path of PATHNAME" @@ -17,8 +17,8 @@ path = "src/readlink.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "readlink" diff --git a/src/uu/realpath/Cargo.toml b/src/uu/realpath/Cargo.toml index dc21bdaca..f5b9af2e7 100644 --- a/src/uu/realpath/Cargo.toml +++ b/src/uu/realpath/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_realpath" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "realpath ~ (uutils) display resolved absolute path of PATHNAME" @@ -16,8 +16,8 @@ path = "src/realpath.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "realpath" diff --git a/src/uu/relpath/Cargo.toml b/src/uu/relpath/Cargo.toml index 1240d9b1b..89376c12d 100644 --- a/src/uu/relpath/Cargo.toml +++ b/src/uu/relpath/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_relpath" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "relpath ~ (uutils) display relative path of PATHNAME_TO from PATHNAME_FROM" @@ -16,8 +16,8 @@ path = "src/relpath.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "relpath" diff --git a/src/uu/rm/Cargo.toml b/src/uu/rm/Cargo.toml index 20fd60745..2c30446e8 100644 --- a/src/uu/rm/Cargo.toml +++ b/src/uu/rm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_rm" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "rm ~ (uutils) remove PATHNAME" @@ -20,8 +20,8 @@ walkdir = "2.2" remove_dir_all = "0.5.1" winapi = { version="0.3", features=[] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] diff --git a/src/uu/rmdir/Cargo.toml b/src/uu/rmdir/Cargo.toml index 40c2efbb1..27d94ec1d 100644 --- a/src/uu/rmdir/Cargo.toml +++ b/src/uu/rmdir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_rmdir" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "rmdir ~ (uutils) remove empty DIRECTORY" @@ -16,8 +16,8 @@ path = "src/rmdir.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "rmdir" diff --git a/src/uu/seq/Cargo.toml b/src/uu/seq/Cargo.toml index 726c7242b..68aa87bad 100644 --- a/src/uu/seq/Cargo.toml +++ b/src/uu/seq/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_seq" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "seq ~ (uutils) display a sequence of numbers" @@ -18,8 +18,8 @@ path = "src/seq.rs" clap = { version = "2.33", features = ["wrap_help"] } num-bigint = "0.4.0" num-traits = "0.2.14" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "seq" diff --git a/src/uu/shred/Cargo.toml b/src/uu/shred/Cargo.toml index dafff162b..89ed980c1 100644 --- a/src/uu/shred/Cargo.toml +++ b/src/uu/shred/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_shred" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "shred ~ (uutils) hide former FILE contents with repeated overwrites" @@ -20,8 +20,8 @@ filetime = "0.2.1" libc = "0.2.42" rand = "0.5" time = "0.1.40" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "shred" diff --git a/src/uu/shuf/Cargo.toml b/src/uu/shuf/Cargo.toml index 6c0353681..5c99c6d26 100644 --- a/src/uu/shuf/Cargo.toml +++ b/src/uu/shuf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_shuf" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "shuf ~ (uutils) display random permutations of input lines" @@ -17,8 +17,8 @@ path = "src/shuf.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } rand = "0.5" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "shuf" diff --git a/src/uu/sleep/Cargo.toml b/src/uu/sleep/Cargo.toml index 14c4c5300..8414f444c 100644 --- a/src/uu/sleep/Cargo.toml +++ b/src/uu/sleep/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_sleep" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "sleep ~ (uutils) pause for DURATION" @@ -16,8 +16,8 @@ path = "src/sleep.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "sleep" diff --git a/src/uu/sort/Cargo.toml b/src/uu/sort/Cargo.toml index a2e135bb6..14db546eb 100644 --- a/src/uu/sort/Cargo.toml +++ b/src/uu/sort/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_sort" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "sort ~ (uutils) sort input lines" @@ -26,8 +26,8 @@ rand = "0.7" rayon = "1.5" tempfile = "3" unicode-width = "0.1.8" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "sort" diff --git a/src/uu/split/Cargo.toml b/src/uu/split/Cargo.toml index e19695a39..6583d705e 100644 --- a/src/uu/split/Cargo.toml +++ b/src/uu/split/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_split" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "split ~ (uutils) split input into output files" @@ -16,8 +16,8 @@ path = "src/split.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "split" diff --git a/src/uu/stat/Cargo.toml b/src/uu/stat/Cargo.toml index 81af993a5..dec209ea0 100644 --- a/src/uu/stat/Cargo.toml +++ b/src/uu/stat/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_stat" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "stat ~ (uutils) display FILE status" @@ -16,8 +16,8 @@ path = "src/stat.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "libc", "fs", "fsext"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "libc", "fs", "fsext"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "stat" diff --git a/src/uu/stdbuf/Cargo.toml b/src/uu/stdbuf/Cargo.toml index a3eb059eb..e9e162803 100644 --- a/src/uu/stdbuf/Cargo.toml +++ b/src/uu/stdbuf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_stdbuf" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "stdbuf ~ (uutils) run COMMAND with modified standard stream buffering" @@ -17,11 +17,11 @@ path = "src/stdbuf.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } tempfile = "3.1" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [build-dependencies] -libstdbuf = { version="0.0.6", package="uu_stdbuf_libstdbuf", path="src/libstdbuf" } +libstdbuf = { version="0.0.7", package="uu_stdbuf_libstdbuf", path="src/libstdbuf" } [[bin]] name = "stdbuf" diff --git a/src/uu/stdbuf/src/libstdbuf/Cargo.toml b/src/uu/stdbuf/src/libstdbuf/Cargo.toml index 86eb09d46..9f86fcd17 100644 --- a/src/uu/stdbuf/src/libstdbuf/Cargo.toml +++ b/src/uu/stdbuf/src/libstdbuf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_stdbuf_libstdbuf" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "stdbuf/libstdbuf ~ (uutils); dynamic library required for stdbuf" @@ -19,8 +19,8 @@ crate-type = ["cdylib", "rlib"] # XXX: note: the rlib is just to prevent Cargo f [dependencies] cpp = "0.5" libc = "0.2" -uucore = { version=">=0.0.8", package="uucore", path="../../../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../../../uucore_procs" } [build-dependencies] cpp_build = "0.4" diff --git a/src/uu/sum/Cargo.toml b/src/uu/sum/Cargo.toml index e16c865a3..5a212d0d3 100644 --- a/src/uu/sum/Cargo.toml +++ b/src/uu/sum/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_sum" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "sum ~ (uutils) display checksum and block counts for input" @@ -16,8 +16,8 @@ path = "src/sum.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "sum" diff --git a/src/uu/sync/Cargo.toml b/src/uu/sync/Cargo.toml index 83efb815d..a745ac6f8 100644 --- a/src/uu/sync/Cargo.toml +++ b/src/uu/sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_sync" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "sync ~ (uutils) synchronize cache writes to storage" @@ -17,8 +17,8 @@ path = "src/sync.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["wide"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["wide"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } winapi = { version = "0.3", features = ["errhandlingapi", "fileapi", "handleapi", "std", "winbase", "winerror"] } [[bin]] diff --git a/src/uu/tac/Cargo.toml b/src/uu/tac/Cargo.toml index 2d0623cd9..60e5d29ec 100644 --- a/src/uu/tac/Cargo.toml +++ b/src/uu/tac/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_tac" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "tac ~ (uutils) concatenate and display input lines in reverse order" @@ -16,8 +16,8 @@ path = "src/tac.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "tac" diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index a895819cd..bab6c125d 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_tail" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "tail ~ (uutils) display the last lines of input" @@ -17,8 +17,8 @@ path = "src/tail.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["ringbuffer"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["ringbuffer"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } winapi = { version="0.3", features=["fileapi", "handleapi", "processthreadsapi", "synchapi", "winbase"] } [target.'cfg(target_os = "redox")'.dependencies] diff --git a/src/uu/tee/Cargo.toml b/src/uu/tee/Cargo.toml index a88d76508..01c190698 100644 --- a/src/uu/tee/Cargo.toml +++ b/src/uu/tee/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_tee" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "tee ~ (uutils) display input and copy to FILE" @@ -18,8 +18,8 @@ path = "src/tee.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" retain_mut = "0.1.2" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["libc"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "tee" diff --git a/src/uu/test/Cargo.toml b/src/uu/test/Cargo.toml index 6f6dd340e..f69918446 100644 --- a/src/uu/test/Cargo.toml +++ b/src/uu/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_test" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "test ~ (uutils) evaluate comparison and file type expressions" @@ -17,8 +17,8 @@ path = "src/test.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [target.'cfg(target_os = "redox")'.dependencies] redox_syscall = "0.1" diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml index 63a16c086..3e17669e0 100644 --- a/src/uu/timeout/Cargo.toml +++ b/src/uu/timeout/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_timeout" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "timeout ~ (uutils) run COMMAND with a DURATION time limit" @@ -18,8 +18,8 @@ path = "src/timeout.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" nix = "0.20.0" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["process", "signals"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["process", "signals"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] diff --git a/src/uu/touch/Cargo.toml b/src/uu/touch/Cargo.toml index e2f948a5a..5bb5822ec 100644 --- a/src/uu/touch/Cargo.toml +++ b/src/uu/touch/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_touch" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "touch ~ (uutils) change FILE timestamps" @@ -18,8 +18,8 @@ path = "src/touch.rs" filetime = "0.2.1" clap = { version = "2.33", features = ["wrap_help"] } time = "0.1.40" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["libc"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "touch" diff --git a/src/uu/tr/Cargo.toml b/src/uu/tr/Cargo.toml index 7783db144..f75a540ee 100644 --- a/src/uu/tr/Cargo.toml +++ b/src/uu/tr/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_tr" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "tr ~ (uutils) translate characters within input and display" @@ -18,8 +18,8 @@ path = "src/tr.rs" bit-set = "0.5.0" fnv = "1.0.5" clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "tr" diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs index 28ce70c22..6dd81badf 100644 --- a/src/uu/tr/src/tr.rs +++ b/src/uu/tr/src/tr.rs @@ -173,16 +173,14 @@ struct TranslateAndSqueezeOperation { } impl TranslateAndSqueezeOperation { - fn new( - set1: ExpandSet, - set2: &mut ExpandSet, - set2_: ExpandSet, - truncate: bool, - complement: bool, - ) -> TranslateAndSqueezeOperation { + fn new(sets: Vec, truncate: bool, complement: bool) -> TranslateAndSqueezeOperation { + let set1 = ExpandSet::new(sets[0].as_ref()); + let set1_ = ExpandSet::new(sets[0].as_ref()); + let mut set2 = ExpandSet::new(sets[1].as_ref()); + let set2_ = ExpandSet::new(sets[1].as_ref()); TranslateAndSqueezeOperation { - translate: TranslateOperation::new(set1, set2, truncate, complement), - squeeze: SqueezeOperation::new(set2_, complement), + translate: TranslateOperation::new(set1, &mut set2, truncate, complement), + squeeze: SqueezeOperation::new(if complement { set1_ } else { set2_ }, complement), } } } @@ -235,10 +233,9 @@ fn get_usage() -> String { } fn get_long_usage() -> String { - String::from( - "Translate, squeeze, and/or delete characters from standard input, -writing to standard output.", - ) + "Translate, squeeze, and/or delete characters from standard input, +writing to standard output." + .to_string() } pub fn uumain(args: impl uucore::Args) -> i32 { @@ -259,10 +256,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let squeeze_flag = matches.is_present(options::SQUEEZE); let truncate_flag = matches.is_present(options::TRUNCATE); - let sets: Vec = match matches.values_of(options::SETS) { - Some(v) => v.map(|v| v.to_string()).collect(), - None => vec![], - }; + let sets = matches + .values_of(options::SETS) + .map(|v| v.map(ToString::to_string).collect::>()) + .unwrap_or_default(); if sets.is_empty() { show_error!( @@ -302,15 +299,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let op = SqueezeOperation::new(set1, complement_flag); translate_input(&mut locked_stdin, &mut buffered_stdout, op); } else { - let mut set2 = ExpandSet::new(sets[1].as_ref()); - let set2_ = ExpandSet::new(sets[1].as_ref()); - let op = TranslateAndSqueezeOperation::new( - set1, - &mut set2, - set2_, - complement_flag, - truncate_flag, - ); + let op = TranslateAndSqueezeOperation::new(sets, truncate_flag, complement_flag); translate_input(&mut locked_stdin, &mut buffered_stdout, op); } } else { @@ -360,5 +349,11 @@ pub fn uu_app() -> App<'static, 'static> { .short("t") .help("first truncate SET1 to length of SET2"), ) - .arg(Arg::with_name(options::SETS).multiple(true)) + .arg( + Arg::with_name(options::SETS) + .multiple(true) + .takes_value(true) + .min_values(1) + .max_values(2), + ) } diff --git a/src/uu/true/Cargo.toml b/src/uu/true/Cargo.toml index 06e7c35ff..36ea0f991 100644 --- a/src/uu/true/Cargo.toml +++ b/src/uu/true/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_true" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "true ~ (uutils) do nothing and succeed" @@ -16,8 +16,8 @@ path = "src/true.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "true" diff --git a/src/uu/truncate/Cargo.toml b/src/uu/truncate/Cargo.toml index 50d3dc4f3..6441f2e14 100644 --- a/src/uu/truncate/Cargo.toml +++ b/src/uu/truncate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_truncate" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "truncate ~ (uutils) truncate (or extend) FILE to SIZE" @@ -16,8 +16,8 @@ path = "src/truncate.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "truncate" diff --git a/src/uu/tsort/Cargo.toml b/src/uu/tsort/Cargo.toml index 37f543012..ec9dd05f9 100644 --- a/src/uu/tsort/Cargo.toml +++ b/src/uu/tsort/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_tsort" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "tsort ~ (uutils) topologically sort input (partially ordered) pairs" @@ -16,8 +16,8 @@ path = "src/tsort.rs" [dependencies] clap= "2.33" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "tsort" diff --git a/src/uu/tty/Cargo.toml b/src/uu/tty/Cargo.toml index 90396ff40..6a4cb73a6 100644 --- a/src/uu/tty/Cargo.toml +++ b/src/uu/tty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_tty" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "tty ~ (uutils) display the name of the terminal connected to standard input" @@ -18,8 +18,8 @@ path = "src/tty.rs" clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" atty = "0.2" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["fs"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["fs"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "tty" diff --git a/src/uu/uname/Cargo.toml b/src/uu/uname/Cargo.toml index 54a1591a2..a12b095aa 100644 --- a/src/uu/uname/Cargo.toml +++ b/src/uu/uname/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_uname" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "uname ~ (uutils) display system information" @@ -17,8 +17,8 @@ path = "src/uname.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } platform-info = "0.1" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "uname" diff --git a/src/uu/unexpand/Cargo.toml b/src/uu/unexpand/Cargo.toml index 5e47d8b58..a0aa3c1de 100644 --- a/src/uu/unexpand/Cargo.toml +++ b/src/uu/unexpand/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_unexpand" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "unexpand ~ (uutils) convert input spaces to tabs" @@ -17,8 +17,8 @@ path = "src/unexpand.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } unicode-width = "0.1.5" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "unexpand" diff --git a/src/uu/uniq/Cargo.toml b/src/uu/uniq/Cargo.toml index be082fe88..aed487b59 100644 --- a/src/uu/uniq/Cargo.toml +++ b/src/uu/uniq/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_uniq" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "uniq ~ (uutils) filter identical adjacent lines from input" @@ -18,8 +18,8 @@ path = "src/uniq.rs" clap = { version = "2.33", features = ["wrap_help"] } strum = "0.20" strum_macros = "0.20" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "uniq" diff --git a/src/uu/unlink/Cargo.toml b/src/uu/unlink/Cargo.toml index ef0f291f8..3f13a7231 100644 --- a/src/uu/unlink/Cargo.toml +++ b/src/uu/unlink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_unlink" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "unlink ~ (uutils) remove a (file system) link to FILE" @@ -17,8 +17,8 @@ path = "src/unlink.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } libc = "0.2.42" -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "unlink" diff --git a/src/uu/uptime/Cargo.toml b/src/uu/uptime/Cargo.toml index eec745ab1..a5b7a3177 100644 --- a/src/uu/uptime/Cargo.toml +++ b/src/uu/uptime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_uptime" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "uptime ~ (uutils) display dynamic system information" @@ -17,8 +17,8 @@ path = "src/uptime.rs" [dependencies] chrono = "0.4" clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["libc", "utmpx"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["libc", "utmpx"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "uptime" diff --git a/src/uu/users/Cargo.toml b/src/uu/users/Cargo.toml index 6cafd7c32..ec4f0785e 100644 --- a/src/uu/users/Cargo.toml +++ b/src/uu/users/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_users" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "users ~ (uutils) display names of currently logged-in users" @@ -16,8 +16,8 @@ path = "src/users.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["utmpx"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["utmpx"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [[bin]] name = "users" diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml index ad4301e7a..31a7ac7af 100644 --- a/src/uu/wc/Cargo.toml +++ b/src/uu/wc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_wc" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "wc ~ (uutils) display newline, word, and byte counts for input" @@ -16,8 +16,8 @@ path = "src/wc.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore" } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore" } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } thiserror = "1.0" [target.'cfg(unix)'.dependencies] diff --git a/src/uu/who/Cargo.toml b/src/uu/who/Cargo.toml index 06388c7bf..1b3abe91e 100644 --- a/src/uu/who/Cargo.toml +++ b/src/uu/who/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_who" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "who ~ (uutils) display information about currently logged-in users" @@ -15,8 +15,8 @@ edition = "2018" path = "src/who.rs" [dependencies] -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["utmpx"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["utmpx"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } clap = { version = "2.33", features = ["wrap_help"] } [[bin]] diff --git a/src/uu/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml index a7fc19848..919aab2e5 100644 --- a/src/uu/whoami/Cargo.toml +++ b/src/uu/whoami/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_whoami" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "whoami ~ (uutils) display user name of current effective user ID" @@ -16,8 +16,8 @@ path = "src/whoami.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["entries", "wide"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "wide"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [target.'cfg(target_os = "windows")'.dependencies] winapi = { version = "0.3", features = ["lmcons"] } diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml index 0338a4037..ff8465557 100644 --- a/src/uu/yes/Cargo.toml +++ b/src/uu/yes/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu_yes" -version = "0.0.6" +version = "0.0.7" authors = ["uutils developers"] license = "MIT" description = "yes ~ (uutils) repeatedly display a line with STRING (or 'y')" @@ -16,8 +16,8 @@ path = "src/yes.rs" [dependencies] clap = { version = "2.33", features = ["wrap_help"] } -uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["zero-copy"] } -uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" } +uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["zero-copy"] } +uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" } [features] default = [] diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 0c11d2c15..9ded42bbd 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uucore" -version = "0.0.8" +version = "0.0.9" authors = ["uutils developers"] license = "MIT" description = "uutils ~ 'core' uutils code library (cross-platform)" diff --git a/src/uucore_procs/Cargo.toml b/src/uucore_procs/Cargo.toml index 0be04db5c..809bbc867 100644 --- a/src/uucore_procs/Cargo.toml +++ b/src/uucore_procs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uucore_procs" -version = "0.0.5" +version = "0.0.6" authors = ["Roy Ivy III "] license = "MIT" description = "uutils ~ 'uucore' proc-macros" diff --git a/tests/by-util/test_du.rs b/tests/by-util/test_du.rs index e63aa4585..607d5dc45 100644 --- a/tests/by-util/test_du.rs +++ b/tests/by-util/test_du.rs @@ -573,7 +573,8 @@ fn test_du_bytes() { #[cfg(all( not(target_vendor = "apple"), not(target_os = "windows"), - not(target_os = "freebsd") + not(target_os = "freebsd"), + not(target_os = "linux") ))] result.stdout_contains("21529\t./subdir\n"); } diff --git a/tests/by-util/test_tr.rs b/tests/by-util/test_tr.rs index 936af2ca8..8a3e36625 100644 --- a/tests/by-util/test_tr.rs +++ b/tests/by-util/test_tr.rs @@ -127,6 +127,15 @@ fn test_squeeze_complement() { .stdout_is("aaBcDcc"); } +#[test] +fn test_squeeze_complement_two_sets() { + new_ucmd!() + .args(&["-sc", "a", "_"]) + .pipe_in("test a aa with 3 ___ spaaaces +++") // spell-checker:disable-line + .run() + .stdout_is("_a_aa_aaa_"); +} + #[test] fn test_translate_and_squeeze() { new_ucmd!() @@ -275,3 +284,11 @@ fn test_interpret_backslash_at_eol_literally() { .succeeds() .stdout_is("\\"); } + +#[test] +fn test_more_than_2_sets() { + new_ucmd!() + .args(&["'abcdefgh'", "'a", "'b'"]) + .pipe_in("hello world") + .fails(); +} diff --git a/tests/by-util/test_whoami.rs b/tests/by-util/test_whoami.rs index 0afe94161..3e8d5afa6 100644 --- a/tests/by-util/test_whoami.rs +++ b/tests/by-util/test_whoami.rs @@ -39,7 +39,6 @@ fn test_normal_compare_env() { let whoami = whoami(); if whoami == "nobody" { println!("test skipped:"); - return; } else if !is_ci() { new_ucmd!().succeeds().stdout_is(format!("{}\n", whoami)); } else { diff --git a/tests/common/util.rs b/tests/common/util.rs index 7a641a353..68b7caa9b 100644 --- a/tests/common/util.rs +++ b/tests/common/util.rs @@ -1065,7 +1065,7 @@ pub fn whoami() -> String { /// Add prefix 'g' for `util_name` if not on linux #[cfg(unix)] -pub fn host_name_for<'a>(util_name: &'a str) -> Cow<'a, str> { +pub fn host_name_for(util_name: &str) -> Cow { // In some environments, e.g. macOS/freebsd, the GNU coreutils are prefixed with "g" // to not interfere with the BSD counterparts already in `$PATH`. #[cfg(not(target_os = "linux"))] diff --git a/util/update-version.sh b/util/update-version.sh index c71467fc4..eeacd500f 100644 --- a/util/update-version.sh +++ b/util/update-version.sh @@ -3,22 +3,30 @@ # So, it should be triple-checked -FROM="0.0.5" -TO="0.0.6" +FROM="0.0.6" +TO="0.0.7" -UUCORE_FROM="0.0.7" -UUCORE_TO="0.0.8" +UUCORE_PROCS_FROM="0.0.5" +UUCORE_PROCS_TO="0.0.6" -PROGS=$(ls -1d src/uu/*/Cargo.toml src/uu/stdbuf/src/libstdbuf/Cargo.toml Cargo.toml) +UUCORE_FROM="0.0.8" +UUCORE_TO="0.0.9" + +PROGS=$(ls -1d src/uu/*/Cargo.toml src/uu/stdbuf/src/libstdbuf/Cargo.toml Cargo.toml src/uu/base64/Cargo.toml) # update the version of all programs sed -i -e "s|version = \"$FROM\"|version = \"$TO\"|" $PROGS +# Update uucore_procs +sed -i -e "s|version = \"$UUCORE_PROCS_FROM\"|version = \"$UUCORE_PROCS_TO\"|" src/uucore_procs/Cargo.toml + # Update the stdbuf stuff sed -i -e "s|libstdbuf = { version=\"$FROM\"|libstdbuf = { version=\"$TO\"|" src/uu/stdbuf/Cargo.toml sed -i -e "s|= { optional=true, version=\"$FROM\", package=\"uu_|= { optional=true, version=\"$TO\", package=\"uu_|g" Cargo.toml # Update uucore itself -#sed -i -e "s|version = \"$UUCORE_FROM\"|version = \"$UUCORE_TO\"|" src/uucore/Cargo.toml +sed -i -e "s|version = \"$UUCORE_FROM\"|version = \"$UUCORE_TO\"|" src/uucore/Cargo.toml # Update crates using uucore -#sed -i -e "s|uucore = { version=\">=$UUCORE_FROM\",|uucore = { version=\">=$UUCORE_TO\",|" $PROGS +sed -i -e "s|uucore = { version=\">=$UUCORE_FROM\",|uucore = { version=\">=$UUCORE_TO\",|" $PROGS +# Update crates using uucore_procs +sed -i -e "s|uucore_procs = { version=\">=$UUCORE_PROCS_FROM\",|uucore_procs = { version=\">=$UUCORE_PROCS_TO\",|" $PROGS