chore: Upgrade clap in fcomm

- Removed `AppSettings` and `AppSettings::DeriveDisplayOrder` from `fcomm.rs`, cleaning up unused imports.
  See https://github.com/clap-rs/clap/blob/a3d93f485f0178f13fabedc55664071778d3f1d9/CHANGELOG.md?plain=1#L731
- Upgraded 'clap' package in `Cargo.toml` to align with the workspace version.
- Updated 'clap-verbosity-flag' package from '1.0' to '2.0',

fcomm/Cargo.toml

@@ -17,8 +17,8 @@ base64 = { workspace = true }
 bellperson = { workspace = true }
 bincode = { workspace = true }
 blstrs = { workspace = true }
-clap = { version = "3.2", features = ["derive"] }
-clap-verbosity-flag = "1.0"
+clap = { workspace = true, features = ["derive"] }
+clap-verbosity-flag = "2.0"
 ff = { workspace = true }
 hex = { version = "0.4.3", features = ["serde"] }
 log = { workspace = true }

fcomm/src/bin/fcomm.rs

@@ -21,7 +21,7 @@ use lurk::ptr::{Ptr, TypePredicates};
 use lurk::public_parameters::error;
 use lurk::store::Store;
 
-use clap::{AppSettings, Args, Parser, Subcommand};
+use clap::{Args, Parser, Subcommand};
 use clap_verbosity_flag::{Verbosity, WarnLevel};
 
 use fcomm::{
@@ -34,7 +34,6 @@ use lurk::public_parameters::{public_params, FileStore};
 /// Functional commitments
 #[derive(Parser, Debug)]
 #[clap(version, about, long_about = None)]
-#[clap(global_setting(AppSettings::DeriveDisplayOrder))]
 struct Cli {
     /// Evaluate inputs before passing to function (outside the proof) when opening. Otherwise inputs are unevaluated.
     #[clap(long, value_parser)]

fcomm/tests/proof_tests.rs

@@ -24,9 +24,9 @@ fn test_bad_command() {
     let mut cmd = fcomm_cmd();
 
     cmd.arg("uiop");
-    cmd.assert().failure().stderr(predicate::str::contains(
-        "error: Found argument 'uiop' which wasn't expected, or isn't valid in this context",
-    ));
+    cmd.assert()
+        .failure()
+        .stderr(predicate::str::contains("unrecognized subcommand \'uiop\'"));
 }
 
 #[test]