Simplify some pattern-matches (#16402) (#16446)

When those match an exact combinator on Option / Result.

Tool-aided by [comby-rust](https://github.com/huitseeker/comby-rust).

(cherry picked from commit b08cff9e77)

Co-authored-by: François Garillot <4142+huitseeker@users.noreply.github.com>

tokens/src/arg_parser.rs

@@ -410,15 +410,16 @@ fn parse_distribute_stake_args(
     )?;
 
     let lockup_authority_str = value_t!(matches, "lockup_authority", String).ok();
-    let lockup_authority = match lockup_authority_str {
-        Some(path) => Some(signer_from_path(
-            &signer_matches,
-            &path,
-            "lockup authority",
-            &mut wallet_manager,
-        )?),
-        None => None,
-    };
+    let lockup_authority = lockup_authority_str
+        .map(|path| {
+            signer_from_path(
+                &signer_matches,
+                &path,
+                "lockup authority",
+                &mut wallet_manager,
+            )
+        })
+        .transpose()?;
 
     let stake_args = StakeArgs {
         stake_account_address,