Remove clap dependency

Cargo.toml

@@ -25,7 +25,6 @@ rustfix = "0.6.1"
 cargo-platform = "0.1.2"
 comma = "1.0.0"
 distance = "0.4.0"
-clap = { version = "4.3.11", features = ["derive"] }
 anyhow = "1.0.6"
 indicatif = "0.17.6"
 prettydiff = "0.6.4"

src/config/args.rs

@@ -1,36 +1,39 @@
 //! Default argument processing when `ui_test` is used
 //! as a test driver.
 
-use clap::Parser;
-
 /// Plain arguments if `ui_test` is used as a binary.
-#[derive(Parser, Debug, Clone)]
-#[command(author, version, about, long_about = None)]
 pub struct Args {
     /// Filters that will be used to match on individual tests
     pub filters: Vec<String>,
 
     /// Whether to minimize output given to the user.
-    #[arg(short, long, default_value_t = false)]
     pub quiet: bool,
 
     /// Whether error on mismatches between `.stderr` files and actual
     /// output. Will update the files otherwise.
-    #[arg(long, default_value_t = false)]
     pub check: bool,
 }
 
-impl Default for Args {
-    fn default() -> Self {
-        Self::parse_from([std::env::current_exe().unwrap()])
-    }
-}
-
 impl Args {
-    /// Arguments if `ui_test` is used as a `cargo test`, so we need
-    /// to skip a level of `--` in order to not pick up `cargo`'s test
-    /// flags.
+    /// Arguments if `ui_test` is used as a `harness=false` test, called from `cargo test`.
     pub fn test() -> Self {
-        Args::parse_from(std::env::args().skip_while(|arg| arg != "--"))
+        let mut args = Args {
+            filters: vec![],
+            quiet: false,
+            check: false,
+        };
+        for arg in std::env::args().skip(1) {
+            if arg == "--" {
+                continue;
+            }
+            if arg == "--quiet" {
+                args.quiet = true;
+            } else if arg == "--check" {
+                args.check = true;
+            } else {
+                args.filters.push(arg);
+            }
+        }
+        args
     }
 }

src/lib.rs

@@ -9,8 +9,6 @@
 //! A crate to run the Rust compiler (or other binaries) and test their command line output.
 
 use bstr::ByteSlice;
-pub use clap;
-use clap::Parser;
 pub use color_eyre;
 use color_eyre::eyre::{eyre, Result};
 use crossbeam_channel::{unbounded, Receiver, Sender};
@@ -120,7 +118,7 @@ pub type Filter = Vec<(Match, &'static [u8])>;
 /// Run all tests as described in the config argument.
 /// Will additionally process command line arguments.
 pub fn run_tests(config: Config) -> Result<()> {
-    let args = Args::parse();
+    let args = Args::test();
     if !args.quiet {
         eprintln!("   Compiler: {}", config.program.display());
     }

tests/integration.rs

@@ -1,6 +1,5 @@
 use std::path::Path;
 
-use clap::Parser;
 use colored::Colorize;
 use ui_test::color_eyre::Result;
 use ui_test::*;
@@ -22,7 +21,7 @@ fn run(name: &str, mode: Mode) -> Result<()> {
         mode,
         ..Config::cargo(root_dir.clone())
     };
-    let args = Args::parse();
+    let args = Args::test();
 
     if !args.check {
         config.output_conflict_handling = OutputConflictHandling::Bless;