Merge branch 'main' into cksum-ln

Author: oech3

Cargo.toml

@@ -617,9 +617,12 @@ workspace = true
 # This is the linting configuration for all crates.
 # In order to use these, all crates have `[lints] workspace = true` section.
 [workspace.lints.rust]
-# Allow "fuzzing" as a "cfg" condition name
+# Allow "fuzzing" as a "cfg" condition name and "cygwin" as a value for "target_os"
 # https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+  'cfg(fuzzing)',
+  'cfg(target_os, values("cygwin"))',
+] }
 #unused_qualifications = "warn" // TODO: fix warnings in uucore, then re-enable this lint
 
 [workspace.lints.clippy]

src/uu/cksum/src/cksum.rs

@@ -180,7 +180,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     // --untagged is cksum specific. So we use this form...
     let is_cksum = binary_name.ends_with("cksum");
     // clap cannot overrides_with --binary by --tag unilaterally...
-    let tag = (!is_cksum && std::env::args().any(|a| a == "--tag" || a == "-t"))
+    let tag = (!is_cksum && std::env::args().any(|a| a == "--tag"))
         || (is_cksum && !matches.get_flag(options::UNTAGGED));
     let binary = matches.get_flag(options::BINARY);
 
@@ -269,6 +269,7 @@ pub fn uu_app() -> Command {
                 .long(options::BINARY)
                 .short('b')
                 .hide(true)
+                .overrides_with(options::TEXT)
                 .action(ArgAction::SetTrue),
         )
         .arg(

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

@@ -10,6 +10,9 @@ keywords.workspace = true
 categories.workspace = true
 edition.workspace = true
 
+[lints]
+workspace = true
+
 [lib]
 name = "stdbuf"
 path = "src/libstdbuf.rs"