refactor(picker): extract pick_flag helper to reduce duplication

2 files changed, 10 insertions, 6 deletions

diff --git a/arg_picker/src/picker/parse.rs b/arg_picker/src/picker/parse.rs
index 366028b..9db5bd9 100644
--- a/arg_picker/src/picker/parse.rs
+++ b/arg_picker/src/picker/parse.rs
@@ -21,14 +21,16 @@ internal_repeat!(1..=32 => {
 internal_repeat!(1..=32 => {
     impl<'a, (T$,+), Route> PickerPattern$<'a, (T$,+), Route>
     where (T$: Pickable<'a>,+) {
-        /// Unwraps the result, panicking if a route was selected.
+        /// Unwraps the result, panicking if a route was selected or a required
+        /// value is missing.
         ///
         /// # Panics
         ///
-        /// Panics if a route was selected.
+        /// Panics if a route was selected, or if a required argument was not
+        /// provided by the user.
         pub fn unwrap(self) -> ((T$,+)) {
             let p = self.parse();
-            ((p.v$.unwrap(),+))
+            ((p.v$.expect(concat!("missing required argument at position ", $)),+))
         }
 
         /// Returns the individual option values without checking the route.
diff --git a/arg_picker/src/picker/result.rs b/arg_picker/src/picker/result.rs
index 83ca2cd..2099825 100644
--- a/arg_picker/src/picker/result.rs
+++ b/arg_picker/src/picker/result.rs
@@ -21,13 +21,15 @@ internal_repeat!(1..=32 => {
 
 internal_repeat!(1..=32 => {
     impl<(T$,+), Route> PickerResult$<(T$,+), Route> {
-        /// Unwraps the result, panicking if a route was selected.
+        /// Unwraps the result, panicking if a route was selected or a required
+        /// value is missing.
         ///
         /// # Panics
         ///
-        /// Panics if `self.route` is `Some(...)`.
+        /// Panics if `self.route` is `Some(...)`, or if a required argument was
+        /// not provided by the user.
         pub fn unwrap(self) -> ((T$,+)) {
-            ((self.v$.unwrap(),+))
+            ((self.v$.expect(concat!("missing required argument at position ", $)),+))
         }
 
         /// Returns the individual option values without checking the route.