Splitting parser feature into multiple subfeatures to reduce dependency bloat

src/uu/dd/Cargo.toml

@@ -23,7 +23,7 @@ gcd = { workspace = true }
 libc = { workspace = true }
 uucore = { workspace = true, features = [
   "format",
-  "parser",
+  "parser-size",
   "quoting-style",
   "fs",
 ] }

src/uu/df/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/df.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["libc", "fsext", "parser", "fs"] }
+uucore = { workspace = true, features = ["libc", "fsext", "parser-size", "fs"] }
 unicode-width = { workspace = true }
 thiserror = { workspace = true }
 fluent = { workspace = true }

src/uu/du/Cargo.toml

@@ -24,7 +24,8 @@ clap = { workspace = true }
 uucore = { workspace = true, features = [
   "format",
   "fsext",
-  "parser",
+  "parser-size",
+  "parser-glob",
   "time",
   "safe-traversal",
 ] }

src/uu/head/Cargo.toml

@@ -22,7 +22,7 @@ clap = { workspace = true }
 memchr = { workspace = true }
 thiserror = { workspace = true }
 uucore = { workspace = true, features = [
-  "parser",
+  "parser-size",
   "ringbuffer",
   "lines",
   "fs",

src/uu/ls/Cargo.toml

@@ -36,7 +36,8 @@ uucore = { workspace = true, features = [
   "fs",
   "fsext",
   "fsxattr",
-  "parser",
+  "parser-size",
+  "parser-glob",
   "quoting-style",
   "time",
   "version-cmp",

src/uu/od/Cargo.toml

@@ -21,7 +21,7 @@ path = "src/od.rs"
 byteorder = { workspace = true }
 clap = { workspace = true }
 half = { workspace = true }
-uucore = { workspace = true, features = ["parser"] }
+uucore = { workspace = true, features = ["parser-size"] }
 fluent = { workspace = true }
 libc.workspace = true
 

src/uu/shred/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/shred.rs"
 [dependencies]
 clap = { workspace = true }
 rand = { workspace = true }
-uucore = { workspace = true, features = ["parser"] }
+uucore = { workspace = true, features = ["parser-size"] }
 libc = { workspace = true }
 fluent = { workspace = true }
 

src/uu/sort/Cargo.toml

@@ -34,7 +34,7 @@ self_cell = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 unicode-width = { workspace = true }
-uucore = { workspace = true, features = ["fs", "parser", "version-cmp"] }
+uucore = { workspace = true, features = ["fs", "parser-size", "version-cmp"] }
 fluent = { workspace = true }
 nix = { workspace = true }
 
@@ -44,7 +44,7 @@ tempfile = { workspace = true }
 uucore = { workspace = true, features = [
   "benchmark",
   "fs",
-  "parser",
+  "parser-size",
   "version-cmp",
   "i18n-collator",
 ] }

src/uu/split/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/split.rs"
 [dependencies]
 clap = { workspace = true }
 memchr = { workspace = true }
-uucore = { workspace = true, features = ["fs", "parser"] }
+uucore = { workspace = true, features = ["fs", "parser-size"] }
 thiserror = { workspace = true }
 fluent = { workspace = true }
 

src/uu/stdbuf/Cargo.toml

@@ -22,7 +22,7 @@ path = "src/stdbuf.rs"
 clap = { workspace = true }
 libstdbuf = { package = "uu_stdbuf_libstdbuf", version = "0.4.0", path = "src/libstdbuf" }
 tempfile = { workspace = true }
-uucore = { workspace = true, features = ["parser"] }
+uucore = { workspace = true, features = ["parser-size"] }
 thiserror = { workspace = true }
 fluent = { workspace = true }
 

src/uu/tail/Cargo.toml

@@ -23,7 +23,7 @@ clap = { workspace = true }
 libc = { workspace = true }
 memchr = { workspace = true }
 notify = { workspace = true }
-uucore = { workspace = true, features = ["fs", "parser"] }
+uucore = { workspace = true, features = ["fs", "parser-size"] }
 same-file = { workspace = true }
 fluent = { workspace = true }
 

src/uu/truncate/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/truncate.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["parser"] }
+uucore = { workspace = true, features = ["parser-size"] }
 fluent = { workspace = true }
 
 [[bin]]

src/uucore/Cargo.toml

@@ -22,7 +22,7 @@ workspace = true
 path = "src/lib/lib.rs"
 
 [dependencies]
-bstr = { workspace = true }
+bstr = { workspace = true, optional = true }
 chrono = { workspace = true, optional = true }
 clap = { workspace = true }
 uucore_procs = { workspace = true }
@@ -102,7 +102,7 @@ xattr = { workspace = true, optional = true }
 tempfile = { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-procfs = { workspace = true }
+procfs = { workspace = true, optional = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi-util = { workspace = true, optional = true }
@@ -129,7 +129,7 @@ entries = ["libc"]
 extendedbigdecimal = ["bigdecimal", "num-traits"]
 fast-inc = []
 fs = ["dunce", "libc", "winapi-util", "windows-sys"]
-fsext = ["libc", "windows-sys"]
+fsext = ["libc", "windows-sys", "bstr"]
 fsxattr = ["xattr"]
 hardware = []
 lines = []
@@ -138,7 +138,7 @@ format = [
   "bigdecimal",
   "extendedbigdecimal",
   "itertools",
-  "parser",
+  "parser-num",
   "num-traits",
   "quoting-style",
 ]
@@ -149,7 +149,10 @@ i18n-decimal = ["i18n-common", "icu_decimal", "icu_provider"]
 mode = ["libc"]
 perms = ["entries", "libc", "walkdir"]
 buf-copy = []
-parser = ["extendedbigdecimal", "glob", "num-traits"]
+parser-num = ["extendedbigdecimal", "num-traits"]
+parser-size = ["parser-num", "procfs"]
+parser-glob = ["glob"]
+parser = ["parser-num", "parser-size", "parser-glob"]
 pipes = []
 process = ["libc"]
 proc-info = ["tty", "walkdir"]

src/uucore/src/lib/features.rs

@@ -32,7 +32,12 @@ pub mod fsext;
 pub mod i18n;
 #[cfg(feature = "lines")]
 pub mod lines;
-#[cfg(feature = "parser")]
+#[cfg(any(
+    feature = "parser",
+    feature = "parser-num",
+    feature = "parser-size",
+    feature = "parser-glob"
+))]
 pub mod parser;
 #[cfg(feature = "quoting-style")]
 pub mod quoting_style;

src/uucore/src/lib/features/parser/mod.rs

@@ -4,8 +4,13 @@
 // file that was distributed with this source code.
 // spell-checker:ignore extendedbigdecimal
 
+#[cfg(any(feature = "parser", feature = "parser-num"))]
 pub mod num_parser;
+#[cfg(any(feature = "parser", feature = "parser-glob"))]
 pub mod parse_glob;
+#[cfg(any(feature = "parser", feature = "parser-size"))]
 pub mod parse_size;
+#[cfg(any(feature = "parser", feature = "parser-num"))]
 pub mod parse_time;
+#[cfg(any(feature = "parser", feature = "parser-num"))]
 pub mod shortcut_value_parser;

src/uucore/src/lib/lib.rs

@@ -60,7 +60,12 @@ pub use crate::features::hardware;
 pub use crate::features::i18n;
 #[cfg(feature = "lines")]
 pub use crate::features::lines;
-#[cfg(feature = "parser")]
+#[cfg(any(
+    feature = "parser",
+    feature = "parser-num",
+    feature = "parser-size",
+    feature = "parser-glob"
+))]
 pub use crate::features::parser;
 #[cfg(feature = "quoting-style")]
 pub use crate::features::quoting_style;