From 5c93c592db69312c0460c66c78fdddb624fc7462 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Wed, 6 Sep 2023 09:47:50 +0200
Subject: [PATCH] uucore: turn version_cmp into a feature

---
 src/uu/ls/Cargo.toml                                 | 2 +-
 src/uu/sort/Cargo.toml                               | 2 +-
 src/uucore/Cargo.toml                                | 1 +
 src/uucore/src/lib/features.rs                       | 2 ++
 src/uucore/src/lib/{mods => features}/version_cmp.rs | 0
 src/uucore/src/lib/lib.rs                            | 3 ++-
 src/uucore/src/lib/mods.rs                           | 1 -
 7 files changed, 7 insertions(+), 4 deletions(-)
 rename src/uucore/src/lib/{mods => features}/version_cmp.rs (100%)

diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
index f3fc2eb6b..24b6947fd 100644
--- a/src/uu/ls/Cargo.toml
+++ b/src/uu/ls/Cargo.toml
@@ -23,7 +23,7 @@ term_grid = { workspace = true }
 terminal_size = { workspace = true }
 glob = { workspace = true }
 lscolors = { workspace = true }
-uucore = { workspace = true, features = ["entries", "fs"] }
+uucore = { workspace = true, features = ["entries", "fs", "version-cmp"] }
 once_cell = { workspace = true }
 selinux = { workspace = true, optional = true }
 
diff --git a/src/uu/sort/Cargo.toml b/src/uu/sort/Cargo.toml
index 359a2b012..981e71641 100644
--- a/src/uu/sort/Cargo.toml
+++ b/src/uu/sort/Cargo.toml
@@ -27,7 +27,7 @@ rayon = { workspace = true }
 self_cell = { workspace = true }
 tempfile = { workspace = true }
 unicode-width = { workspace = true }
-uucore = { workspace = true, features = ["fs"] }
+uucore = { workspace = true, features = ["fs", "version-cmp"] }
 
 [[bin]]
 name = "sort"
diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
index fcbfdeac7..15a053ac4 100644
--- a/src/uucore/Cargo.toml
+++ b/src/uucore/Cargo.toml
@@ -100,4 +100,5 @@ sum = [
 update-control = []
 utf8 = []
 utmpx = ["time", "time/macros", "libc", "dns-lookup"]
+version-cmp = []
 wide = []
diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs
index 786a64682..49eee3843 100644
--- a/src/uucore/src/lib/features.rs
+++ b/src/uucore/src/lib/features.rs
@@ -26,6 +26,8 @@ pub mod sum;
 mod tokenize;
 #[cfg(feature = "update-control")]
 pub mod update_control;
+#[cfg(feature = "version-cmp")]
+pub mod version_cmp;
 
 // * (platform-specific) feature-gated modules
 // ** non-windows (i.e. Unix + Fuchsia)
diff --git a/src/uucore/src/lib/mods/version_cmp.rs b/src/uucore/src/lib/features/version_cmp.rs
similarity index 100%
rename from src/uucore/src/lib/mods/version_cmp.rs
rename to src/uucore/src/lib/features/version_cmp.rs
diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs
index 5b9f4ae12..c0732f069 100644
--- a/src/uucore/src/lib/lib.rs
+++ b/src/uucore/src/lib/lib.rs
@@ -26,7 +26,6 @@ pub use crate::mods::line_ending;
 pub use crate::mods::os;
 pub use crate::mods::panic;
 pub use crate::mods::quoting_style;
-pub use crate::mods::version_cmp;
 
 // * string parsing modules
 pub use crate::parser::parse_glob;
@@ -55,6 +54,8 @@ pub use crate::features::ringbuffer;
 pub use crate::features::sum;
 #[cfg(feature = "update-control")]
 pub use crate::features::update_control;
+#[cfg(feature = "version-cmp")]
+pub use crate::features::version_cmp;
 
 // * (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 caa8fcb92..d3a2dc19e 100644
--- a/src/uucore/src/lib/mods.rs
+++ b/src/uucore/src/lib/mods.rs
@@ -9,6 +9,5 @@ pub mod error;
 pub mod line_ending;
 pub mod os;
 pub mod panic;
-pub mod version_cmp;
 // dir and vdir also need access to the quoting_style module
 pub mod quoting_style;