From b992fdce83f2e08c41b7a0b6addbf77d01581b8f Mon Sep 17 00:00:00 2001 From: favilances Date: Sat, 9 May 2026 22:12:17 +0300 Subject: [PATCH] uudoc: add missing dependencies for all-features builds The uudoc binary imports zip and uuhelp_parser when the uudoc feature is enabled, but the root package did not declare those dependencies. This broke all-features builds and clippy checks. Declare the dependencies behind the uudoc feature so the documentation binary can be checked reliably without adding them to the default build. Signed-off-by: favilances --- Cargo.lock | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 6 ++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 93c195e2..b1b8172a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + [[package]] name = "aho-corasick" version = "1.1.4" @@ -191,6 +197,12 @@ version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "cc" version = "1.2.56" @@ -331,6 +343,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crypto-common" version = "0.1.7" @@ -490,6 +517,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fluent" version = "0.17.0" @@ -838,6 +875,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "nix" version = "0.30.1" @@ -1256,6 +1303,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + [[package]] name = "siphasher" version = "1.0.2" @@ -1539,9 +1592,11 @@ dependencies = [ "uu_setsid", "uu_uuidgen", "uucore 0.2.2", + "uuhelp_parser", "uuid", "uutests", "xattr", + "zip", ] [[package]] @@ -2341,6 +2396,18 @@ dependencies = [ "zerofrom", ] +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] + [[package]] name = "zmij" version = "1.0.21" diff --git a/Cargo.toml b/Cargo.toml index 1abbd0eb..7db79e07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ build = "build.rs" [features] default = ["feat_common_core"] -uudoc = [] +uudoc = ["dep:uuhelp_parser", "dep:zip"] feat_common_core = [ "blockdev", @@ -76,10 +76,12 @@ tempfile = "3.9.0" textwrap = { version = "0.16.0", features = ["terminal_size"] } thiserror = "2.0" uucore = "0.2.2" +uuhelp_parser = "0.2.2" uuid = { version = "1.16.0", features = ["rng-rand"] } uutests = "0.8.0" windows = { version = "0.62.2" } xattr = "1.3.1" +zip = { version = "0.6.6", default-features = false, features = ["deflate"] } [dependencies] clap = { workspace = true } @@ -92,6 +94,8 @@ serde = { workspace = true } serde_json = { workspace = true } textwrap = { workspace = true } uucore = { workspace = true } +uuhelp_parser = { workspace = true, optional = true } +zip = { workspace = true, optional = true } # blockdev = { optional = true, version = "0.0.1", package = "uu_blockdev", path = "src/uu/blockdev" }