From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Jun 2023 18:53:40 +0000 (+0100)
Subject: clap: Factor verify_cli out into utils
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=de531818d9f5ee9906ca7bc78742787d74ef53e5;p=hippotat.git

clap: Factor verify_cli out into utils

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/client/client.rs b/client/client.rs
index b5a8d77..2a1f2de 100644
--- a/client/client.rs
+++ b/client/client.rs
@@ -380,5 +380,5 @@ async fn main() {
 
 #[test]
 fn verify_cli() {
-  <Opts as clap::CommandFactory>::command().debug_assert()
+  hippotat::utils::verify_cli::<Opts>();
 }
diff --git a/server/server.rs b/server/server.rs
index afd9aa5..d535fa4 100644
--- a/server/server.rs
+++ b/server/server.rs
@@ -317,5 +317,5 @@ pub fn crash(what_happened: Result<AE, String>, task: &str) -> ! {
 
 #[test]
 fn verify_cli() {
-  <Opts as clap::CommandFactory>::command().debug_assert()
+  hippotat::utils::verify_cli::<Opts>();
 }
diff --git a/src/utils.rs b/src/utils.rs
index 03409fb..df2130c 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -230,3 +230,8 @@ fn hmac_test_vectors(){
     assert_eq!(&got[..], &exp);
   }
 }
+
+pub fn verify_cli<F: clap::CommandFactory>() {
+  let app: clap::App = F::command();
+  app.debug_assert();
+}