cp: compile without clap (for nushell)

Cargo.toml

@@ -342,7 +342,7 @@ blake3 = "1.5.0"
 sm3 = "0.4.2"
 digest = "0.10.7"
 
-uucore = { version = ">=0.0.19", package = "uucore", path = "src/uucore" }
+uucore = { version = ">=0.0.19", package = "uucore", path = "src/uucore", default-features = false }
 uucore_procs = { version = ">=0.0.19", package = "uucore_procs", path = "src/uucore_procs" }
 uu_ls = { version = ">=0.0.18", path = "src/uu/ls" }
 uu_base32 = { version = ">=0.0.18", path = "src/uu/base32" }

src/uu/cp/Cargo.toml

@@ -19,21 +19,25 @@ 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 }
 selinux = { workspace = true, optional = true }
-uucore = { workspace = true, features = [
-  "backup-control",
+walkdir = { workspace = true }
+indicatif = { workspace = true }
+
+[dependencies.uucore]
+workspace = true
+default-features = false
+features = [
   "entries",
   "fs",
-  "perms",
   "mode",
+  "perms",
   "update-control",
-] }
-walkdir = { workspace = true }
-indicatif = { workspace = true }
+  "backup-control",
+]
 
 [target.'cfg(unix)'.dependencies]
 xattr = { workspace = true }
@@ -44,5 +48,7 @@ name = "cp"
 path = "src/main.rs"
 
 [features]
+default = ["cli-parser"]
 feat_selinux = ["selinux"]
 feat_acl = ["exacl"]
+cli-parser = ["dep:clap", "uucore/cli-parser"]

src/uu/cp/src/cp.rs

@@ -10,7 +10,6 @@ use quick_error::quick_error;
 use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::collections::{HashMap, HashSet};
-use std::env;
 #[cfg(not(windows))]
 use std::ffi::CString;
 use std::fs::{self, File, OpenOptions};
@@ -22,6 +21,7 @@ use std::os::unix::fs::{FileTypeExt, PermissionsExt};
 use std::path::{Path, PathBuf, StripPrefixError};
 use std::string::ToString;
 
+#[cfg(feature = "cli-parser")]
 use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgMatches, Command};
 use filetime::FileTime;
 use indicatif::{ProgressBar, ProgressStyle};
@@ -31,7 +31,9 @@ use quick_error::ResultExt;
 
 use platform::copy_on_write;
 use uucore::display::Quotable;
-use uucore::error::{set_exit_code, UClapError, UError, UResult, UUsageError};
+use uucore::error::UError;
+#[cfg(feature = "cli-parser")]
+use uucore::error::{set_exit_code, UClapError, UResult, UUsageError};
 use uucore::fs::{
     canonicalize, is_symlink_loop, paths_refer_to_same_file, FileInformation, MissingHandling,
     ResolveMode,
@@ -40,10 +42,9 @@ use uucore::{backup_control, update_control};
 // These are exposed for projects (e.g. nushell) that want to create an `Options` value, which
 // requires these enum.
 pub use uucore::{backup_control::BackupMode, update_control::UpdateMode};
-use uucore::{
-    crash, format_usage, help_about, help_section, help_usage, prompt_yes, show_error,
-    show_warning, util_name,
-};
+use uucore::{crash, prompt_yes, show_error, show_warning, util_name};
+#[cfg(feature = "cli-parser")]
+use uucore::{format_usage, help_about, help_section, help_usage};
 
 use crate::copydir::copy_directory;
 
@@ -350,13 +351,10 @@ fn show_debug(copy_debug: &CopyDebug) {
     );
 }
 
-const ABOUT: &str = help_about!("cp.md");
-const USAGE: &str = help_usage!("cp.md");
-const AFTER_HELP: &str = help_section!("after help", "cp.md");
-
 static EXIT_ERR: i32 = 1;
 
 // Argument constants
+#[cfg(feature = "cli-parser")]
 mod options {
     pub const ARCHIVE: &str = "archive";
     pub const ATTRIBUTES_ONLY: &str = "attributes-only";
@@ -391,6 +389,7 @@ mod options {
 }
 
 #[cfg(unix)]
+#[allow(dead_code)]
 static PRESERVABLE_ATTRIBUTES: &[&str] = &[
     "mode",
     "ownership",
@@ -403,6 +402,7 @@ static PRESERVABLE_ATTRIBUTES: &[&str] = &[
 ];
 
 #[cfg(not(unix))]
+#[allow(dead_code)]
 static PRESERVABLE_ATTRIBUTES: &[&str] = &[
     "mode",
     "timestamps",
@@ -413,6 +413,7 @@ static PRESERVABLE_ATTRIBUTES: &[&str] = &[
     "all",
 ];
 
+#[cfg(feature = "cli-parser")]
 pub fn uu_app() -> Command {
     const MODE_ARGS: &[&str] = &[
         options::LINK,
@@ -421,6 +422,10 @@ pub fn uu_app() -> Command {
         options::ATTRIBUTES_ONLY,
         options::COPY_CONTENTS,
     ];
+    const ABOUT: &str = help_about!("cp.md");
+    const USAGE: &str = help_usage!("cp.md");
+    const AFTER_HELP: &str = help_section!("after help", "cp.md");
+
     Command::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
@@ -696,6 +701,7 @@ pub fn uu_app() -> Command {
         )
 }
 
+#[cfg(feature = "cli-parser")]
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let matches = uu_app().try_get_matches_from(args);
@@ -744,6 +750,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 impl ClobberMode {
+    #[cfg(feature = "cli-parser")]
     fn from_matches(matches: &ArgMatches) -> Self {
         if matches.get_flag(options::FORCE) {
             Self::Force
@@ -756,6 +763,7 @@ impl ClobberMode {
 }
 
 impl OverwriteMode {
+    #[cfg(feature = "cli-parser")]
     fn from_matches(matches: &ArgMatches) -> Self {
         if matches.get_flag(options::INTERACTIVE) {
             Self::Interactive(ClobberMode::from_matches(matches))
@@ -768,6 +776,7 @@ impl OverwriteMode {
 }
 
 impl CopyMode {
+    #[cfg(feature = "cli-parser")]
     fn from_matches(matches: &ArgMatches) -> Self {
         if matches.get_flag(options::LINK) {
             Self::Link
@@ -887,6 +896,7 @@ impl Attributes {
 }
 
 impl Options {
+    #[cfg(feature = "cli-parser")]
     #[allow(clippy::cognitive_complexity)]
     fn from_matches(matches: &ArgMatches) -> CopyResult<Self> {
         let not_implemented_opts = vec![
@@ -1076,6 +1086,7 @@ impl TargetType {
 }
 
 /// Returns tuple of (Source paths, Target)
+#[cfg(feature = "cli-parser")]
 fn parse_path_args(
     mut paths: Vec<PathBuf>,
     options: &Options,
@@ -1323,6 +1334,7 @@ pub(crate) fn copy_attributes(
 
     // Ownership must be changed first to avoid interfering with mode change.
     #[cfg(unix)]
+    #[cfg(feature = "cli-parser")]
     handle_preserve(&attributes.ownership, || -> CopyResult<()> {
         use std::os::unix::prelude::MetadataExt;
         use uucore::perms::wrap_chown;

src/uu/cp/src/main.rs

@@ -1 +1,7 @@
+#[cfg(feature = "cli-parser")]
 uucore::bin!(uu_cp);
+
+// for avoiding cargo check error
+// consider adding a `main` function to `src/uu/cp/src/main.rs`
+#[cfg(not(feature = "cli-parser"))]
+fn main() {}

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.4", optional = true }
 dunce = { version = "1.0.4", optional = true }
@@ -69,8 +69,7 @@ windows-sys = { workspace = true, optional = true, default-features = false, fea
 ] }
 
 [features]
-default = []
-# * non-default features
+default = ["cli-parser"]
 backup-control = []
 encoding = ["data-encoding", "data-encoding-macro", "z85", "thiserror"]
 entries = ["libc"]
@@ -103,3 +102,4 @@ utf8 = []
 utmpx = ["time", "time/macros", "libc", "dns-lookup"]
 version-cmp = []
 wide = []
+cli-parser = ["dep:clap"]

src/uucore/src/lib/features/backup_control.rs

@@ -82,13 +82,14 @@
 
 // spell-checker:ignore backupopt
 
-use crate::{
-    display::Quotable,
-    error::{UError, UResult},
-};
+#[cfg(feature = "cli-parser")]
+use crate::error::UResult;
+use crate::{display::Quotable, error::UError};
+#[cfg(feature = "cli-parser")]
 use clap::ArgMatches;
+#[cfg(feature = "cli-parser")]
+use std::env;
 use std::{
-    env,
     error::Error,
     fmt::{Debug, Display},
     path::{Path, PathBuf},
@@ -201,6 +202,7 @@ impl Display for BackupError {
 /// recommended to include the `clap` arguments via the functions provided here.
 /// This way the backup-specific arguments are handled uniformly across
 /// utilities and can be maintained in one central place.
+#[cfg(feature = "cli-parser")]
 pub mod arguments {
     use clap::ArgAction;
 
@@ -249,6 +251,7 @@ pub mod arguments {
 ///
 /// This function directly takes [`clap::ArgMatches`] as argument and looks for
 /// the '-S' and '--suffix' arguments itself.
+#[cfg(feature = "cli-parser")]
 pub fn determine_backup_suffix(matches: &ArgMatches) -> String {
     let supplied_suffix = matches.get_one::<String>(arguments::OPT_SUFFIX);
     if let Some(suffix) = supplied_suffix {
@@ -336,6 +339,7 @@ pub fn determine_backup_suffix(matches: &ArgMatches) -> String {
 ///     show!(err);
 /// }
 /// ```
+#[cfg(feature = "cli-parser")]
 pub fn determine_backup_mode(matches: &ArgMatches) -> UResult<BackupMode> {
     if matches.contains_id(arguments::OPT_BACKUP) {
         // Use method to determine the type of backups to make. When this option
@@ -381,6 +385,7 @@ pub fn determine_backup_mode(matches: &ArgMatches) -> UResult<BackupMode> {
 ///
 /// [10]: BackupError::InvalidArgument
 /// [11]: BackupError::AmbiguousArgument
+#[cfg(feature = "cli-parser")]
 fn match_method(method: &str, origin: &str) -> UResult<BackupMode> {
     let matches: Vec<&&str> = BACKUP_CONTROL_VALUES
         .iter()

src/uucore/src/lib/features/perms.rs

@@ -8,15 +8,20 @@
 use crate::display::Quotable;
 use crate::error::strip_errno;
 use crate::error::UResult;
+#[cfg(feature = "cli-parser")]
 use crate::error::USimpleError;
 pub use crate::features::entries;
 use crate::fs::resolve_relative_path;
 use crate::show_error;
+use libc::{self, gid_t, uid_t};
+use walkdir::WalkDir;
+
+#[cfg(feature = "cli-parser")]
 use clap::Arg;
+#[cfg(feature = "cli-parser")]
 use clap::ArgMatches;
+#[cfg(feature = "cli-parser")]
 use clap::Command;
-use libc::{self, gid_t, uid_t};
-use walkdir::WalkDir;
 
 use std::io::Error as IOError;
 use std::io::Result as IOResult;
@@ -469,6 +474,8 @@ pub struct GidUidOwnerFilter {
     pub raw_owner: String,
     pub filter: IfFrom,
 }
+
+#[cfg(feature = "cli-parser")]
 type GidUidFilterOwnerParser = fn(&ArgMatches) -> UResult<GidUidOwnerFilter>;
 
 /// Base implementation for `chgrp` and `chown`.
@@ -479,6 +486,7 @@ type GidUidFilterOwnerParser = fn(&ArgMatches) -> UResult<GidUidOwnerFilter>;
 /// from `ArgMatches`.
 /// `groups_only` determines whether verbose output will only mention the group.
 #[allow(clippy::cognitive_complexity)]
+#[cfg(feature = "cli-parser")]
 pub fn chown_base(
     mut command: Command,
     args: impl crate::Args,

src/uucore/src/lib/features/update_control.rs

@@ -46,6 +46,7 @@
 //!     }
 //! }
 //! ```
+#[cfg(feature = "cli-parser")]
 use clap::ArgMatches;
 
 // Available update mode
@@ -60,6 +61,7 @@ pub enum UpdateMode {
     ReplaceIfOlder,
 }
 
+#[cfg(feature = "cli-parser")]
 pub mod arguments {
     use clap::ArgAction;
 
@@ -119,6 +121,7 @@ pub mod arguments {
 ///     let update_mode = update_control::determine_update_mode(&matches);
 ///     assert_eq!(update_mode, UpdateMode::ReplaceAll)
 /// }
+#[cfg(feature = "cli-parser")]
 pub fn determine_update_mode(matches: &ArgMatches) -> UpdateMode {
     if let Some(mode) = matches.get_one::<String>(arguments::OPT_UPDATE) {
         match mode.as_str() {

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