chore: move clap.rs from foundry-common to foundry-cli (#11747)

Move clap.rs from foundry-common to foundry-cli

Co-authored-by: onbjerg <[email protected]>

Author: Peponks9

Cargo.lock

@@ -35,7 +35,7 @@ pub fn run_command(args: Anvil) -> Result<()> {
             }
             AnvilSubcommand::GenerateFigSpec => {
                 clap_complete::generate(
-                    foundry_common::clap::Shell::Fig,
+                    foundry_cli::clap::Shell::Fig,
                     &mut Anvil::command(),
                     "anvil",
                     &mut std::io::stdout(),
@@ -82,7 +82,7 @@ mod tests {
         assert!(matches!(
             args.cmd,
             Some(AnvilSubcommand::Completions {
-                shell: foundry_common::clap::Shell::ClapCompleteShell(clap_complete::Shell::Bash)
+                shell: foundry_cli::clap::Shell::ClapCompleteShell(clap_complete::Shell::Bash)
             })
         ));
     }

crates/anvil/src/args.rs

@@ -24,7 +24,7 @@ pub enum AnvilSubcommand {
     #[command(visible_alias = "com")]
     Completions {
         #[arg(value_enum)]
-        shell: foundry_common::clap::Shell,
+        shell: foundry_cli::clap::Shell,
     },
 
     /// Generate Fig autocompletion spec. Deprecated: use `anvil completions fig` instead.

crates/anvil/src/opts.rs

@@ -731,7 +731,7 @@ pub async fn run_command(args: CastArgs) -> Result<()> {
         }
         CastSubcommand::GenerateFigSpec => {
             generate(
-                foundry_common::clap::Shell::Fig,
+                foundry_cli::clap::Shell::Fig,
                 &mut CastArgs::command(),
                 "cast",
                 &mut std::io::stdout(),

crates/cast/src/args.rs

@@ -1076,7 +1076,7 @@ pub enum CastSubcommand {
     #[command(visible_alias = "com")]
     Completions {
         #[arg(value_enum)]
-        shell: foundry_common::clap::Shell,
+        shell: foundry_cli::clap::Shell,
     },
 
     /// Generate Fig autocompletion spec. Deprecated: use `cast completions fig` instead.

crates/cast/src/opts.rs

@@ -34,6 +34,9 @@ alloy-ens = { workspace = true, features = ["provider"] }
 
 cfg-if = "1.0"
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
+clap_complete.workspace = true
+clap_complete_nushell.workspace = true
+clap_complete_fig = "4"
 color-eyre.workspace = true
 dotenvy = "0.15"
 eyre.workspace = true

crates/cli/Cargo.toml

@@ -11,6 +11,7 @@ extern crate foundry_common;
 #[macro_use]
 extern crate tracing;
 
+pub mod clap;
 pub mod handler;
 pub mod opts;
 pub mod utils;

crates/common/src/clap.rs renamed to crates/cli/src/clap.rs

@@ -51,9 +51,6 @@ solar.workspace = true
 tower.workspace = true
 
 clap = { version = "4", features = ["derive", "env", "unicode", "wrap_help"] }
-clap_complete.workspace = true
-clap_complete_nushell.workspace = true
-clap_complete_fig = "4"
 comfy-table.workspace = true
 dunce.workspace = true
 eyre.workspace = true

crates/cli/src/lib.rs

@@ -18,7 +18,6 @@ pub use foundry_common_fmt as fmt;
 
 pub mod abi;
 pub mod calc;
-pub mod clap;
 pub mod comments;
 pub mod compile;
 pub mod constants;