Merge pull request #5238 from cakebaker/uucore_ranges_feature

uucore: turn ranges into a feature
uutils · Sep 3, 2023 · 7c7a608 · 7c7a608
2 parents f8845cd + 183d465
commit 7c7a608
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/src/uu/cut/Cargo.toml b/src/uu/cut/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/cut.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true }
+uucore = { workspace = true, features = ["ranges"] }
 memchr = { workspace = true }
 bstr = { workspace = true }
 is-terminal = { workspace = true }

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

diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
@@ -82,6 +82,7 @@ mode = ["libc"]
 perms = ["libc", "walkdir"]
 pipes = []
 process = ["libc"]
+ranges = []
 ringbuffer = []
 signals = []
 sum = [

diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs
@@ -16,6 +16,8 @@ pub mod fsext;
 pub mod lines;
 #[cfg(feature = "memo")]
 pub mod memo;
+#[cfg(feature = "ranges")]
+pub mod ranges;
 #[cfg(feature = "ringbuffer")]
 pub mod ringbuffer;
 #[cfg(feature = "sum")]

diff --git a/src/uucore/src/lib/mods/ranges.rs → src/uucore/src/lib/features/ranges.rs b/src/uucore/src/lib/mods/ranges.rs → src/uucore/src/lib/features/ranges.rs
diff --git 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::ranges;
 pub use crate::mods::version_cmp;
 
 // * string parsing modules
@@ -48,6 +47,8 @@ pub use crate::features::fsext;
 pub use crate::features::lines;
 #[cfg(feature = "memo")]
 pub use crate::features::memo;
+#[cfg(feature = "ranges")]
+pub use crate::features::ranges;
 #[cfg(feature = "ringbuffer")]
 pub use crate::features::ringbuffer;
 #[cfg(feature = "sum")]

diff --git a/src/uucore/src/lib/mods.rs b/src/uucore/src/lib/mods.rs
@@ -9,7 +9,6 @@ pub mod error;
 pub mod line_ending;
 pub mod os;
 pub mod panic;
-pub mod ranges;
 pub mod version_cmp;
 // dir and vdir also need access to the quoting_style module
 pub mod quoting_style;