Reformat TOML files with taplo

npx --yes @taplo/cli fmt

Cargo.toml

@@ -42,7 +42,13 @@ feat_acl = ["cp/feat_acl"]
 # NOTE:
 # * The selinux(-sys) crate requires `libselinux` headers and shared library to be accessible in the C toolchain at compile time.
 # * Running a uutils compiled with `feat_selinux` requires an SELinux enabled Kernel at run time.
-feat_selinux = ["cp/selinux", "id/selinux", "ls/selinux", "selinux", "feat_require_selinux"]
+feat_selinux = [
+  "cp/selinux",
+  "id/selinux",
+  "ls/selinux",
+  "selinux",
+  "feat_require_selinux",
+]
 ##
 ## feature sets
 ## (common/core and Tier1) feature sets
@@ -177,9 +183,7 @@ feat_os_unix_android = [
 # ** NOTE: these `feat_require_...` sets should be minimized as much as possible to encourage cross-platform availability of utilities
 #
 # "feat_require_crate_cpp" == set of utilities requiring the `cpp` crate (which fail to compile on several platforms; as of 2020-04-23)
-feat_require_crate_cpp = [
+feat_require_crate_cpp = ["stdbuf"]
-    "stdbuf",
-]
 # "feat_require_unix" == set of utilities requiring support which is only available on unix platforms (as of 2020-04-23)
 feat_require_unix = [
   "chgrp",
@@ -203,21 +207,11 @@ feat_require_unix = [
 ]
 # "feat_require_unix_utmpx" == set of utilities requiring unix utmp/utmpx support
 # * ref: <https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs?>
-feat_require_unix_utmpx = [
+feat_require_unix_utmpx = ["pinky", "uptime", "users", "who"]
-    "pinky",
-    "uptime",
-    "users",
-    "who",
-]
 # "feat_require_unix_hostid" == set of utilities requiring gethostid in libc (only some unixes provide)
-feat_require_unix_hostid = [
+feat_require_unix_hostid = ["hostid"]
-    "hostid",
-]
 # "feat_require_selinux" == set of utilities depending on SELinux.
-feat_require_selinux = [
+feat_require_selinux = ["chcon", "runcon"]
-    "chcon",
-    "runcon",
-]
 ## (alternate/newer/smaller platforms) feature sets
 # "feat_os_unix_fuchsia" == set of utilities which can be built/run on the "Fuchsia" OS (refs: <https://fuchsia.dev>; <https://en.wikipedia.org/wiki/Google_Fuchsia>)
 feat_os_unix_fuchsia = [
@@ -268,7 +262,11 @@ binary-heap-plus = "0.5.0"
 bstr = "1.5"
 bytecount = "0.6.3"
 byteorder = "1.4.3"
-chrono = { version="^0.4.26", default-features=false, features=["std", "alloc", "clock"]}
+chrono = { version = "^0.4.26", default-features = false, features = [
+  "std",
+  "alloc",
+  "clock",
+] }
 clap = { version = "4.3", features = ["wrap_help", "cargo"] }
 clap_complete = "4.3"
 clap_mangen = "0.2"
@@ -291,7 +289,9 @@ indicatif = "0.17"
 is-terminal = "0.4.7"
 itertools = "0.10.5"
 libc = "0.2.146"
-lscolors = { version = "0.14.0", default-features=false, features = ["nu-ansi-term"] }
+lscolors = { version = "0.14.0", default-features = false, features = [
+  "nu-ansi-term",
+] }
 memchr = "2"
 nix = { version = "0.26", default-features = false }
 nom = "7.1.3"

Makefile.toml

@@ -20,15 +20,12 @@ run_task = "_init"
 
 [tasks._init]
 private = true
-dependencies = [
+dependencies = ["_init-vars"]
-	"_init-vars",
-]
 
 [tasks._init-vars]
 private = true
 script_runner = "@duckscript"
-script = [
+script = ['''
-'''
 # reset build/test flags
 set_env CARGO_MAKE_CARGO_BUILD_TEST_FLAGS ""
 # determine features
@@ -90,54 +87,36 @@ for arg in "${args_utils_list}"
 end
 args_utils = trim "${args_utils}"
 set_env CARGO_MAKE_TASK_BUILD_UTILS_ARGS "${args_utils}"
-'''
+''']
-]
 
 ### tasks
 
 [tasks.default]
 description = "## *DEFAULT* Build (debug-mode) and test project"
 category = "[project]"
-dependencies = [
+dependencies = ["action-build-debug", "test-terse"]
-	"action-build-debug",
-	"test-terse",
-]
 
 ##
 
 [tasks.build]
 description = "## Build (release-mode) project"
 category = "[project]"
-dependencies = [
+dependencies = ["core::pre-build", "action-build-release", "core::post-build"]
-	"core::pre-build",
-	"action-build-release",
-	"core::post-build",
-]
 
 [tasks.build-debug]
 description = "## Build (debug-mode) project"
 category = "[project]"
-dependencies = [
+dependencies = ["action-build-debug"]
-	"action-build-debug",
-]
 
 [tasks.build-examples]
 description = "## Build (release-mode) project example(s); usage: `cargo make (build-examples | examples) [EXAMPLE]...`"
 category = "[project]"
-dependencies = [
+dependencies = ["core::pre-build", "action-build-examples", "core::post-build"]
-	"core::pre-build",
-	"action-build-examples",
-	"core::post-build",
-]
 
 [tasks.build-features]
 description = "## Build (with features; release-mode) project; usage: `cargo make (build-features | features) FEATURE...`"
 category = "[project]"
-dependencies = [
+dependencies = ["core::pre-build", "action-build-features", "core::post-build"]
-	"core::pre-build",
-	"action-build-features",
-	"core::post-build",
-]
 
 [tasks.build-release]
 alias = "build"
@@ -148,9 +127,7 @@ alias = "build-debug"
 [tasks.example]
 description = "hidden singular-form alias for 'examples'"
 category = "[project]"
-dependencies = [
+dependencies = ["examples"]
-	"examples",
-]
 
 [tasks.examples]
 alias = "build-examples"
@@ -161,17 +138,12 @@ alias = "build-features"
 [tasks.format]
 description = "## Format code files (with `cargo fmt`; includes tests)"
 category = "[project]"
-dependencies = [
+dependencies = ["action-format", "action-format-tests"]
-	"action-format",
-	"action-format-tests",
-]
 
 [tasks.help]
 description = "## Display help"
 category = "[project]"
-dependencies = [
+dependencies = ["action-display-help"]
-	"action-display-help",
-]
 
 [tasks.install]
 description = "## Install project binary (to $HOME/.cargo/bin)"
@@ -182,10 +154,7 @@ args = ["install", "--path", "."]
 [tasks.lint]
 description = "## Display lint report"
 category = "[project]"
-dependencies = [
+dependencies = ["action-clippy", "action-fmt_report"]
-	"action-clippy",
-	"action-fmt_report",
-]
 
 [tasks.release]
 alias = "build"
@@ -193,48 +162,32 @@ alias = "build"
 [tasks.test]
 description = "## Run project tests"
 category = "[project]"
-dependencies = [
+dependencies = ["core::pre-test", "core::test", "core::post-test"]
-	"core::pre-test",
-	"core::test",
-	"core::post-test",
-]
 
 [tasks.test-terse]
 description = "## Run project tests (with terse/summary output)"
 category = "[project]"
-dependencies = [
+dependencies = ["core::pre-test", "action-test_quiet", "core::post-test"]
-	"core::pre-test",
-	"action-test_quiet",
-	"core::post-test",
-]
 
 [tasks.test-util]
 description = "## Test (individual) utilities; usage: `cargo make (test-util | test-uutil) [UTIL_NAME...]`"
 category = "[project]"
-dependencies = [
+dependencies = ["action-test-utils"]
-	"action-test-utils",
-]
 
 [tasks.test-utils]
 description = "hidden plural-form alias for 'test-util'"
 category = "[project]"
-dependencies = [
+dependencies = ["test-util"]
-	"test-util",
-]
 
 [tasks.test-uutil]
 description = "hidden alias for 'test-util'"
 category = "[project]"
-dependencies = [
+dependencies = ["test-util"]
-	"test-util",
-]
 
 [tasks.test-uutils]
 description = "hidden alias for 'test-util'"
 category = "[project]"
-dependencies = [
+dependencies = ["test-util"]
-	"test-util",
-]
 
 [tasks.uninstall]
 description = "## Remove project binary (from $HOME/.cargo/bin)"
@@ -255,23 +208,17 @@ dependencies = [
 [tasks.utils]
 description = "hidden plural-form alias for 'util'"
 category = "[project]"
-dependencies = [
+dependencies = ["util"]
-	"util",
-]
 
 [tasks.uutil]
 description = "hidden alias for 'util'"
 category = "[project]"
-dependencies = [
+dependencies = ["util"]
-	"util",
-]
 
 [tasks.uutils]
 description = "hidden plural-form alias for 'util'"
 category = "[project]"
-dependencies = [
+dependencies = ["util"]
-	"util",
-]
 
 ### actions
 
@@ -288,18 +235,27 @@ args = ["build", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )" ]
 [tasks.action-build-examples]
 description = "`cargo build (--examples|(--example EXAMPLE)...)`"
 command = "cargo"
-args = ["build", "--release", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )", "${CARGO_MAKE_TASK_BUILD_EXAMPLES_ARGS}" ]
+args = [
+  "build",
+  "--release",
+  "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )",
+  "${CARGO_MAKE_TASK_BUILD_EXAMPLES_ARGS}",
+]
 
 [tasks.action-build-features]
 description = "`cargo build --release --features FEATURES`"
 command = "cargo"
-args = ["build", "--release", "--no-default-features", "--features", "${CARGO_MAKE_TASK_BUILD_FEATURES_ARGS}" ]
+args = [
+  "build",
+  "--release",
+  "--no-default-features",
+  "--features",
+  "${CARGO_MAKE_TASK_BUILD_FEATURES_ARGS}",
+]
 
 [tasks.action-build-utils]
 description = "Build individual utilities"
-dependencies = [
+dependencies = ["action-determine-utils"]
-	"action-determine-utils",
-]
 command = "cargo"
 # args = ["build", "@@remove-empty(CARGO_MAKE_TASK_BUILD_UTILS_ARGS)" ]
 args = ["build", "--release", "@@split(CARGO_MAKE_TASK_BUILD_UTILS_ARGS, )"]
@@ -311,8 +267,7 @@ args = ["clippy", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"]
 
 [tasks.action-determine-utils]
 script_runner = "@duckscript"
-script = [
+script = ['''
-'''
 package_options = get_env CARGO_MAKE_TASK_BUILD_UTILS_ARGS
 if is_empty "${package_options}"
 	show_utils = get_env CARGO_MAKE_VAR_SHOW_UTILS
@@ -335,13 +290,11 @@ if is_empty "${package_options}"
 	package_options = trim "${package_options}"
 end_if
 set_env CARGO_MAKE_TASK_BUILD_UTILS_ARGS "${package_options}"
-'''
+''']
-]
 
 [tasks.action-determine-tests]
 script_runner = "@duckscript"
-script = [
+script = ['''
-'''
 test_files = glob_array tests/**/*.rs
 for file in ${test_files}
 	file = replace "${file}" "\\" "/"
@@ -354,8 +307,7 @@ for file in ${test_files}
 	end_if
 end
 set_env CARGO_MAKE_VAR_TESTS "${tests}"
-'''
+''']
-]
 
 [tasks.action-format]
 description = "`cargo fmt`"
@@ -364,9 +316,7 @@ args = ["fmt"]
 
 [tasks.action-format-tests]
 description = "`cargo fmt` tests"
-dependencies = [
+dependencies = ["action-determine-tests"]
-	"action-determine-tests",
-]
 command = "cargo"
 args = ["fmt", "--", "@@split(CARGO_MAKE_VAR_TESTS, )"]
 
@@ -381,13 +331,15 @@ args = ["fmt", "--", "--check"]
 [tasks.action-spellcheck-codespell]
 description = "`codespell` spellcheck repository"
 command = "codespell" # (from `pip install codespell`)
-args = [".", "--skip=*/.git,./target,./tests/fixtures", "--ignore-words-list=mut,od"]
+args = [
+  ".",
+  "--skip=*/.git,./target,./tests/fixtures",
+  "--ignore-words-list=mut,od",
+]
 
 [tasks.action-test-utils]
 description = "Build individual utilities"
-dependencies = [
+dependencies = ["action-determine-utils"]
-	"action-determine-utils",
-]
 command = "cargo"
 # args = ["build", "@@remove-empty(CARGO_MAKE_TASK_BUILD_UTILS_ARGS)" ]
 args = ["test", "@@split(CARGO_MAKE_TASK_BUILD_UTILS_ARGS, )"]
@@ -399,8 +351,7 @@ args = ["test", "--quiet", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"]
 
 [tasks.action-display-help]
 script_runner = "@duckscript"
-script = [
+script = ['''
-'''
 	echo ""
 	echo "usage: `cargo make TARGET [ARGS...]`"
 	echo ""
@@ -432,5 +383,4 @@ script = [
 		end_if
 	end
 	echo ""
-'''
+''']
-]

src/uu/date/Cargo.toml

@@ -25,7 +25,10 @@ humantime_to_duration = { workspace=true }
 libc = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_Foundation", "Win32_System_SystemInformation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_Foundation",
+  "Win32_System_SystemInformation",
+] }
 
 [[bin]]
 name = "date"

src/uu/du/Cargo.toml

@@ -22,7 +22,10 @@ clap = { workspace=true }
 uucore = { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_Storage_FileSystem",
+  "Win32_Foundation",
+] }
 
 [[bin]]
 name = "du"

src/uu/hostname/Cargo.toml

@@ -20,7 +20,10 @@ hostname = { version = "0.3", features = ["set"] }
 uucore = { workspace = true, features = ["wide"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_Networking_WinSock", "Win32_Foundation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_Networking_WinSock",
+  "Win32_Foundation",
+] }
 
 [[bin]]
 name = "hostname"

src/uu/install/Cargo.toml

@@ -1,10 +1,7 @@
 [package]
 name = "uu_install"
 version = "0.0.19"
-authors = [
+authors = ["Ben Eills <ben@beneills.com>", "uutils developers"]
-    "Ben Eills <ben@beneills.com>",
-    "uutils developers",
-]
 license = "MIT"
 description = "install ~ (uutils) copy files from SOURCE to DESTINATION (with specified attributes)"
 

src/uu/printf/Cargo.toml

@@ -1,10 +1,7 @@
 [package]
 name = "uu_printf"
 version = "0.0.19"
-authors = [
+authors = ["Nathan Ross", "uutils developers"]
-  "Nathan Ross",
-  "uutils developers",
-]
 license = "MIT"
 description = "printf ~ (uutils) FORMAT and display ARGUMENTS"
 

src/uu/stdbuf/src/libstdbuf/Cargo.toml

@@ -14,7 +14,10 @@ edition = "2021"
 [lib]
 name = "libstdbuf"
 path = "src/libstdbuf.rs"
-crate-type = ["cdylib", "rlib"] # XXX: note: the rlib is just to prevent Cargo from spitting out a warning
+crate-type = [
+  "cdylib",
+  "rlib",
+] # XXX: note: the rlib is just to prevent Cargo from spitting out a warning
 
 [dependencies]
 cpp = "0.5"

src/uu/sync/Cargo.toml

@@ -23,7 +23,11 @@ uucore = { workspace=true, features=["wide"] }
 nix = { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_Storage_FileSystem",
+  "Win32_System_WindowsProgramming",
+  "Win32_Foundation",
+] }
 
 [[bin]]
 name = "sync"

src/uu/tail/Cargo.toml

@@ -26,7 +26,10 @@ is-terminal = { workspace=true }
 fundu = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_System_Threading", "Win32_Foundation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_System_Threading",
+  "Win32_Foundation",
+] }
 winapi-util = { workspace = true }
 
 [dev-dependencies]

src/uu/touch/Cargo.toml

@@ -20,11 +20,19 @@ filetime = { workspace=true }
 clap = { workspace = true }
 # TODO: use workspace dependency (0.3) when switching from time to chrono
 humantime_to_duration = "0.2.1"
-time = { workspace=true, features = ["parsing", "formatting", "local-offset", "macros"] }
+time = { workspace = true, features = [
+  "parsing",
+  "formatting",
+  "local-offset",
+  "macros",
+] }
 uucore = { workspace = true, features = ["libc"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_Storage_FileSystem", "Win32_Foundation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_Storage_FileSystem",
+  "Win32_Foundation",
+] }
 
 [[bin]]
 name = "touch"

src/uu/whoami/Cargo.toml

@@ -19,7 +19,11 @@ clap = { workspace=true }
 uucore = { workspace = true, features = ["entries"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { workspace=true, features = ["Win32_NetworkManagement_NetManagement", "Win32_System_WindowsProgramming", "Win32_Foundation"] }
+windows-sys = { workspace = true, features = [
+  "Win32_NetworkManagement_NetManagement",
+  "Win32_System_WindowsProgramming",
+  "Win32_Foundation",
+] }
 
 [target.'cfg(unix)'.dependencies]
 libc = { workspace = true }

src/uucore/Cargo.toml

@@ -27,7 +27,11 @@ glob = "0.3.1"
 # * optional
 itertools = { version = "0.10.5", optional = true }
 thiserror = { workspace = true, optional = true }
-time = { workspace=true, optional=true, features = ["formatting", "local-offset", "macros"] }
+time = { workspace = true, optional = true, features = [
+  "formatting",
+  "local-offset",
+  "macros",
+] }
 # * "problem" dependencies (pinned)
 data-encoding = { version = "2.4", optional = true }
 data-encoding-macro = { version = "0.1.13", optional = true }
@@ -58,7 +62,11 @@ tempfile = { workspace=true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi-util = { version = "0.1.5", optional = true }
-windows-sys = { version = "0.48.0", optional = true, default-features = false, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_WindowsProgramming"] }
+windows-sys = { version = "0.48.0", optional = true, default-features = false, features = [
+  "Win32_Storage_FileSystem",
+  "Win32_Foundation",
+  "Win32_System_WindowsProgramming",
+] }
 
 [features]
 default = []