wip: progress

Author: Bushuo

src/main.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use clap::{arg, Arg, ArgAction, Args, FromArgMatches, Parser, ValueEnum};
+use clap::{Parser, ValueEnum};
 use clap_verbosity_flag::InfoLevel;
 use log::LevelFilter;
 use regex::Regex;
@@ -26,7 +26,7 @@ enum Command {
 /// default build system fails to pick up changed interfaces across multiple packages.
 #[derive(Parser, Debug)]
 #[command(version)]
-struct DerivedArgs {
+struct Args {
     #[arg(value_enum, default_value_t = Command::Build)]
     command: Command,
 
@@ -84,36 +84,25 @@ struct DerivedArgs {
     /// A custom path to bsc
     #[arg(long)]
     bsc_path: Option<String>,
+
+    /// Use the legacy build system.
+    ///
+    /// After this flag is encountered, the rest of the command line arguments are passed to the legacy build system.
+    #[arg(long, allow_hyphen_values = true, num_args = 0..)]
+    legacy: Vec<String>,
 }
 
 fn main() -> Result<()> {
-    let legacy = clap::Command::new("rewatch")
-        .disable_help_flag(true)
-        .disable_version_flag(true)
-        .arg(
-            arg!(-l - -legacy ... "Use the legacy build system")
-                .global(true)
-                .action(ArgAction::SetTrue),
-        )
-        .defer(|cmd| {
-            cmd.arg(arg!([cmd] ... "commands and args for the legacy build system").trailing_var_arg(true))
-        });
-
-    let legacy_matches = legacy.get_matches();
-
-    if legacy_matches.get_flag("legacy") {
+    let args = Args::parse();
+
+    if !args.legacy.is_empty() {
         let s = std::env::args().collect::<Vec<String>>().join(" ");
 
         println!("Using legacy build system");
         println!("Running: {s}");
         std::process::exit(0);
     }
 
-    let matches = DerivedArgs::augment_args(clap::Command::new("rewatch")).get_matches();
-    let args = DerivedArgs::from_arg_matches(&matches)
-        .map_err(|err| err.exit())
-        .unwrap();
-
     let log_level_filter = args.verbose.log_level_filter();
 
     env_logger::Builder::new()