From d19b8b78d863de0ccab5b6074c28b46ad0eec90b Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Sun, 10 Sep 2023 15:07:37 +0200
Subject: [PATCH] uucore: turn quoting_style into a feature

---
 src/uu/dir/Cargo.toml                                  | 2 +-
 src/uu/ls/Cargo.toml                                   | 7 ++++++-
 src/uu/vdir/Cargo.toml                                 | 2 +-
 src/uu/wc/Cargo.toml                                   | 2 +-
 src/uucore/Cargo.toml                                  | 1 +
 src/uucore/src/lib/features.rs                         | 2 ++
 src/uucore/src/lib/{mods => features}/quoting_style.rs | 0
 src/uucore/src/lib/lib.rs                              | 3 ++-
 src/uucore/src/lib/mods.rs                             | 2 --
 9 files changed, 14 insertions(+), 7 deletions(-)
 rename src/uucore/src/lib/{mods => features}/quoting_style.rs (100%)

diff --git a/src/uu/dir/Cargo.toml b/src/uu/dir/Cargo.toml
index 9cc5fbde4..2a709a804 100644
--- a/src/uu/dir/Cargo.toml
+++ b/src/uu/dir/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/dir.rs"
 
 [dependencies]
 clap = { workspace = true, features = ["env"] }
-uucore = { workspace = true, features = ["entries", "fs"] }
+uucore = { workspace = true, features = ["entries", "fs", "quoting-style"] }
 uu_ls = { workspace = true }
 
 [[bin]]
diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
index 24b6947fd..e4100d07f 100644
--- a/src/uu/ls/Cargo.toml
+++ b/src/uu/ls/Cargo.toml
@@ -23,7 +23,12 @@ term_grid = { workspace = true }
 terminal_size = { workspace = true }
 glob = { workspace = true }
 lscolors = { workspace = true }
-uucore = { workspace = true, features = ["entries", "fs", "version-cmp"] }
+uucore = { workspace = true, features = [
+  "entries",
+  "fs",
+  "quoting-style",
+  "version-cmp",
+] }
 once_cell = { workspace = true }
 selinux = { workspace = true, optional = true }
 
diff --git a/src/uu/vdir/Cargo.toml b/src/uu/vdir/Cargo.toml
index dc57512b1..99bcf383b 100644
--- a/src/uu/vdir/Cargo.toml
+++ b/src/uu/vdir/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/vdir.rs"
 
 [dependencies]
 clap = { workspace = true, features = ["env"] }
-uucore = { workspace = true, features = ["entries", "fs"] }
+uucore = { workspace = true, features = ["entries", "fs", "quoting-style"] }
 uu_ls = { workspace = true }
 
 [[bin]]
diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml
index 199cc4e0a..5712fbd83 100644
--- a/src/uu/wc/Cargo.toml
+++ b/src/uu/wc/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/wc.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["pipes"] }
+uucore = { workspace = true, features = ["pipes", "quoting-style"] }
 bytecount = { workspace = true }
 thiserror = { workspace = true }
 unicode-width = { workspace = true }
diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
index 15a053ac4..90ae74aab 100644
--- a/src/uucore/Cargo.toml
+++ b/src/uucore/Cargo.toml
@@ -82,6 +82,7 @@ mode = ["libc"]
 perms = ["libc", "walkdir"]
 pipes = []
 process = ["libc"]
+quoting-style = []
 ranges = []
 ringbuffer = []
 signals = []
diff --git a/src/uucore/src/lib/features.rs b/src/uucore/src/lib/features.rs
index 49eee3843..3a99eb84f 100644
--- 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 = "quoting-style")]
+pub mod quoting_style;
 #[cfg(feature = "ranges")]
 pub mod ranges;
 #[cfg(feature = "ringbuffer")]
diff --git a/src/uucore/src/lib/mods/quoting_style.rs b/src/uucore/src/lib/features/quoting_style.rs
similarity index 100%
rename from src/uucore/src/lib/mods/quoting_style.rs
rename to src/uucore/src/lib/features/quoting_style.rs
diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs
index c0732f069..2f28195da 100644
--- a/src/uucore/src/lib/lib.rs
+++ b/src/uucore/src/lib/lib.rs
@@ -25,7 +25,6 @@ pub use crate::mods::error;
 pub use crate::mods::line_ending;
 pub use crate::mods::os;
 pub use crate::mods::panic;
-pub use crate::mods::quoting_style;
 
 // * string parsing modules
 pub use crate::parser::parse_glob;
@@ -46,6 +45,8 @@ pub use crate::features::fsext;
 pub use crate::features::lines;
 #[cfg(feature = "memo")]
 pub use crate::features::memo;
+#[cfg(feature = "quoting-style")]
+pub use crate::features::quoting_style;
 #[cfg(feature = "ranges")]
 pub use crate::features::ranges;
 #[cfg(feature = "ringbuffer")]
diff --git a/src/uucore/src/lib/mods.rs b/src/uucore/src/lib/mods.rs
index d3a2dc19e..986536d6d 100644
--- a/src/uucore/src/lib/mods.rs
+++ b/src/uucore/src/lib/mods.rs
@@ -9,5 +9,3 @@ pub mod error;
 pub mod line_ending;
 pub mod os;
 pub mod panic;
-// dir and vdir also need access to the quoting_style module
-pub mod quoting_style;