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 b5a8d7700b3f4f550500b64d5494a421e4d1e45b..2a1f2deb231b63cb2f1a8b73704e0318786875cc 100644 (file)
--- 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 afd9aa53b1015e257d9ff322ff3eadad8fb1cc55..d535fa4eb8660b02258dff4606388595d5ada62d 100644 (file)
--- 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 03409fbed5007a3ab5453cdad2e3d8a526ac1cfe..df2130c541f8cb391d0a5c971c468ad3c9898424 100644 (file)
--- 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();
+}