Skip to content

Commit 6ff2449

Browse files
oech3oech3
authored andcommitted
Merge branch 'main' into cksum-ln
2 parents 39d9dad + 666c6df commit 6ff2449

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,9 +617,12 @@ workspace = true
617617
# This is the linting configuration for all crates.
618618
# In order to use these, all crates have `[lints] workspace = true` section.
619619
[workspace.lints.rust]
620-
# Allow "fuzzing" as a "cfg" condition name
620+
# Allow "fuzzing" as a "cfg" condition name and "cygwin" as a value for "target_os"
621621
# https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
622-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
622+
unexpected_cfgs = { level = "warn", check-cfg = [
623+
'cfg(fuzzing)',
624+
'cfg(target_os, values("cygwin"))',
625+
] }
623626
#unused_qualifications = "warn" // TODO: fix warnings in uucore, then re-enable this lint
624627

625628
[workspace.lints.clippy]

src/uu/cksum/src/cksum.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ pub fn uu_app() -> Command {
269269
.long(options::BINARY)
270270
.short('b')
271271
.hide(true)
272+
.overrides_with(options::TEXT)
272273
.action(ArgAction::SetTrue),
273274
)
274275
.arg(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ keywords.workspace = true
1010
categories.workspace = true
1111
edition.workspace = true
1212

13+
[lints]
14+
workspace = true
15+
1316
[lib]
1417
name = "stdbuf"
1518
path = "src/libstdbuf.rs"

0 commit comments

Comments
 (0)