cp: compile without clap (for nushell)

src/uu/cp/Cargo.toml

@@ -19,7 +19,7 @@ edition = "2021"
 path = "src/cp.rs"
 
 [dependencies]
-clap = { workspace = true }
+clap = { workspace = true, optional = true }
 filetime = { workspace = true }
 libc = { workspace = true }
 quick-error = { workspace = true }
@@ -44,5 +44,7 @@ name = "cp"
 path = "src/main.rs"
 
 [features]
+default = ["cli-parser"]
 feat_selinux = ["selinux"]
 feat_acl = ["exacl"]
+cli-parser = ["clap", "uucore/cli-parser"]

src/uu/date/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/date.rs"
 [dependencies]
 chrono = { workspace = true }
 clap = { workspace = true }
-uucore = { workspace = true }
+uucore = { workspace = true, features = ["cli-parser"] }
 parse_datetime = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]

src/uucore/Cargo.toml

@@ -18,7 +18,7 @@ edition = "2021"
 path = "src/lib/lib.rs"
 
 [dependencies]
-clap = { workspace = true }
+clap = { workspace = true, optional = true }
 uucore_procs = { workspace = true }
 dns-lookup = { version = "2.0.3", optional = true }
 dunce = { version = "1.0.4", optional = true }
@@ -103,3 +103,4 @@ utf8 = []
 utmpx = ["time", "time/macros", "libc", "dns-lookup"]
 version-cmp = []
 wide = []
+cli-parser = ["clap"]

src/uucore/src/lib/lib.rs

@@ -30,6 +30,7 @@ pub use crate::mods::panic;
 pub use crate::parser::parse_glob;
 pub use crate::parser::parse_size;
 pub use crate::parser::parse_time;
+#[cfg(feature = "cli-parser")]
 pub use crate::parser::shortcut_value_parser;
 
 // * feature-gated modules

src/uucore/src/lib/mods/error.rs

@@ -56,6 +56,9 @@
 
 // spell-checker:ignore uioerror rustdoc
 
+// In case we want to build without clap support
+// Example: nushell
+#[cfg(feature = "cli-parser")]
 use clap;
 use std::{
     error::Error,
@@ -688,6 +691,7 @@ impl From<i32> for Box<dyn UError> {
 /// let result: Result<_, Box<dyn UError>> = command.try_get_matches().map_err(Into::into);
 /// ```
 #[derive(Debug)]
+#[cfg(feature = "cli-parser")]
 pub struct ClapErrorWrapper {
     code: i32,
     error: clap::Error,
@@ -698,18 +702,21 @@ pub trait UClapError<T> {
     fn with_exit_code(self, code: i32) -> T;
 }
 
+#[cfg(feature = "cli-parser")]
 impl From<clap::Error> for Box<dyn UError> {
     fn from(e: clap::Error) -> Self {
         Box::new(ClapErrorWrapper { code: 1, error: e })
     }
 }
 
+#[cfg(feature = "cli-parser")]
 impl UClapError<ClapErrorWrapper> for clap::Error {
     fn with_exit_code(self, code: i32) -> ClapErrorWrapper {
         ClapErrorWrapper { code, error: self }
     }
 }
 
+#[cfg(feature = "cli-parser")]
 impl UClapError<Result<clap::ArgMatches, ClapErrorWrapper>>
     for Result<clap::ArgMatches, clap::Error>
 {
@@ -718,6 +725,7 @@ impl UClapError<Result<clap::ArgMatches, ClapErrorWrapper>>
     }
 }
 
+#[cfg(feature = "cli-parser")]
 impl UError for ClapErrorWrapper {
     fn code(&self) -> i32 {
         // If the error is a DisplayHelp or DisplayVersion variant,
@@ -733,9 +741,11 @@ impl UError for ClapErrorWrapper {
     }
 }
 
+#[cfg(feature = "cli-parser")]
 impl Error for ClapErrorWrapper {}
 
 // This is abuse of the Display trait
+#[cfg(feature = "cli-parser")]
 impl Display for ClapErrorWrapper {
     fn fmt(&self, _f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
         self.error.print().unwrap();

src/uucore/src/lib/parser.rs

@@ -5,4 +5,5 @@
 pub mod parse_glob;
 pub mod parse_size;
 pub mod parse_time;
+#[cfg(feature = "cli-parser")]
 pub mod shortcut_value_parser;