From 20f5a0bf1024dcbfa6c7fdbc539251c044f9a579 Mon Sep 17 00:00:00 2001
From: a dinosaur <dino@a-dinosaur.com>
Date: Wed, 26 Nov 2025 15:12:49 +1100
Subject: [PATCH] Backport positional argument handler fix.

---
 README.md             | 1 +
 jaarg/src/argparse.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2aff3aa..441d01e 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ println!("{file:?} -> {out:?} (number: {number:?})",
 ### Changelog ###
 
 main:
+ * Fixed coerced `ArgumentError` not being rewritten for positional arguments.
  * Moved top level includes to `pub use`.
 
 v0.2.1:
diff --git a/jaarg/src/argparse.rs b/jaarg/src/argparse.rs
index a1a68db..1342d45 100644
--- a/jaarg/src/argparse.rs
+++ b/jaarg/src/argparse.rs
@@ -232,7 +232,7 @@ impl<ID: 'static> Opts<ID> {
         // Find the next positional argument
         for (i, option) in self.options[state.positional_index..].iter().enumerate() {
           if matches!(option.r#type, OptType::Positional) {
-            handler(program_name, &option.id, option, option.first_name(), token)?;
+            call_handler(option, option.first_name(), token)?;
             state.positional_index += i + 1;
             return Ok(ParseControl::Continue);
           }