Merge pull request #5254 from cakebaker/uucore_turn_version_cmp_into_feature

uucore: turn version_cmp into a feature

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 }
 

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"

src/uucore/Cargo.toml

@@ -100,4 +100,5 @@ sum = [
 update-control = []
 utf8 = []
 utmpx = ["time", "time/macros", "libc", "dns-lookup"]
+version-cmp = []
 wide = []

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)

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)

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;