Merge pull request #5231 from cakebaker/uucore_backup_control_feature

uucore: turn backup_control into a feature
uutils · Sep 1, 2023 · 6012002 · 6012002
2 parents b783088 + b41ff2e
commit 6012002
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml
@@ -24,7 +24,13 @@ filetime = { workspace = true }
 libc = { workspace = true }
 quick-error = { workspace = true }
 selinux = { workspace = true, optional = true }
-uucore = { workspace = true, features = ["entries", "fs", "perms", "mode"] }
+uucore = { workspace = true, features = [
+  "backup-control",
+  "entries",
+  "fs",
+  "perms",
+  "mode",
+] }
 walkdir = { workspace = true }
 indicatif = { workspace = true }
 

diff --git a/src/uu/install/Cargo.toml b/src/uu/install/Cargo.toml
@@ -19,7 +19,13 @@ clap = { workspace = true }
 filetime = { workspace = true }
 file_diff = { workspace = true }
 libc = { workspace = true }
-uucore = { workspace = true, features = ["fs", "mode", "perms", "entries"] }
+uucore = { workspace = true, features = [
+  "backup-control",
+  "fs",
+  "mode",
+  "perms",
+  "entries",
+] }
 
 [[bin]]
 name = "install"

diff --git a/src/uu/ln/Cargo.toml b/src/uu/ln/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/ln.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["fs"] }
+uucore = { workspace = true, features = ["backup-control", "fs"] }
 
 [[bin]]
 name = "ln"

diff --git a/src/uu/mv/Cargo.toml b/src/uu/mv/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/mv.rs"
 clap = { workspace = true }
 fs_extra = { workspace = true }
 indicatif = { workspace = true }
-uucore = { workspace = true, features = ["fs"] }
+uucore = { workspace = true, features = ["backup-control", "fs"] }
 
 [[bin]]
 name = "mv"

diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
@@ -71,6 +71,7 @@ windows-sys = { workspace = true, optional = true, default-features = false, fea
 [features]
 default = []
 # * non-default features
+backup-control = []
 encoding = ["data-encoding", "data-encoding-macro", "z85", "thiserror"]
 entries = ["libc"]
 fs = ["dunce", "libc", "winapi-util", "windows-sys"]

diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs
@@ -4,6 +4,8 @@
 // file that was distributed with this source code.
 // features ~ feature-gated modules (core/bundler file)
 
+#[cfg(feature = "backup-control")]
+pub mod backup_control;
 #[cfg(feature = "encoding")]
 pub mod encoding;
 #[cfg(feature = "fs")]

diff --git a/src/uucore/src/lib/mods/backup_control.rs → ...uucore/src/lib/features/backup_control.rs b/src/uucore/src/lib/mods/backup_control.rs → ...uucore/src/lib/features/backup_control.rs
diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs
@@ -20,7 +20,6 @@ mod parser; // string parsing modules
 pub use uucore_procs::*;
 
 // * cross-platform modules
-pub use crate::mods::backup_control;
 pub use crate::mods::display;
 pub use crate::mods::error;
 pub use crate::mods::line_ending;
@@ -38,6 +37,8 @@ pub use crate::parser::parse_time;
 pub use crate::parser::shortcut_value_parser;
 
 // * feature-gated modules
+#[cfg(feature = "backup-control")]
+pub use crate::features::backup_control;
 #[cfg(feature = "encoding")]
 pub use crate::features::encoding;
 #[cfg(feature = "fs")]

diff --git a/src/uucore/src/lib/mods.rs b/src/uucore/src/lib/mods.rs
@@ -4,7 +4,6 @@
 // file that was distributed with this source code.
 // mods ~ cross-platforms modules (core/bundler file)
 
-pub mod backup_control;
 pub mod display;
 pub mod error;
 pub mod line_ending;