diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml index 5b5c9c0d1de..83f8dd5c909 100644 --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -30,6 +30,7 @@ uucore = { workspace = true, features = [ "fs", "perms", "mode", + "update-control", ] } walkdir = { workspace = true } indicatif = { workspace = true } diff --git a/src/uu/mv/Cargo.toml b/src/uu/mv/Cargo.toml index 970707853d9..25fa272d6a6 100644 --- a/src/uu/mv/Cargo.toml +++ b/src/uu/mv/Cargo.toml @@ -18,7 +18,11 @@ path = "src/mv.rs" clap = { workspace = true } fs_extra = { workspace = true } indicatif = { workspace = true } -uucore = { workspace = true, features = ["backup-control", "fs"] } +uucore = { workspace = true, features = [ + "backup-control", + "fs", + "update-control", +] } [[bin]] name = "mv" diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index f53b011f564..ad26d3bca4f 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -80,13 +80,10 @@ lines = [] memo = ["itertools"] mode = ["libc"] perms = ["libc", "walkdir"] +pipes = [] process = ["libc"] ringbuffer = [] signals = [] -utf8 = [] -utmpx = ["time", "time/macros", "libc", "dns-lookup"] -wide = [] -pipes = [] sum = [ "digest", "hex", @@ -99,3 +96,7 @@ sum = [ "blake3", "sm3", ] +update-control = [] +utf8 = [] +utmpx = ["time", "time/macros", "libc", "dns-lookup"] +wide = [] diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs index 0a23b9dd968..c2dc975dce1 100644 --- a/src/uucore/src/lib/features.rs +++ b/src/uucore/src/lib/features.rs @@ -22,6 +22,8 @@ pub mod ringbuffer; pub mod sum; #[cfg(feature = "memo")] mod tokenize; +#[cfg(feature = "update-control")] +pub mod update_control; // * (platform-specific) feature-gated modules // ** non-windows (i.e. Unix + Fuchsia) diff --git a/src/uucore/src/lib/mods/update_control.rs b/src/uucore/src/lib/features/update_control.rs similarity index 100% rename from src/uucore/src/lib/mods/update_control.rs rename to src/uucore/src/lib/features/update_control.rs diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs index 818b7bd3fc4..30ebae25429 100644 --- a/src/uucore/src/lib/lib.rs +++ b/src/uucore/src/lib/lib.rs @@ -27,7 +27,6 @@ pub use crate::mods::os; pub use crate::mods::panic; pub use crate::mods::quoting_style; pub use crate::mods::ranges; -pub use crate::mods::update_control; pub use crate::mods::version_cmp; // * string parsing modules @@ -53,6 +52,8 @@ pub use crate::features::memo; pub use crate::features::ringbuffer; #[cfg(feature = "sum")] pub use crate::features::sum; +#[cfg(feature = "update-control")] +pub use crate::features::update_control; // * (platform-specific) feature-gated modules // ** non-windows (i.e. Unix + Fuchsia) diff --git a/src/uucore/src/lib/mods.rs b/src/uucore/src/lib/mods.rs index 6dd49438f64..99055d014f1 100644 --- a/src/uucore/src/lib/mods.rs +++ b/src/uucore/src/lib/mods.rs @@ -10,7 +10,6 @@ pub mod line_ending; pub mod os; pub mod panic; pub mod ranges; -pub mod update_control; pub mod version_cmp; // dir and vdir also need access to the quoting_style module pub mod quoting_style;