commit aa1efc4204a03a1f1bffe0a5615fc769762f42af
author Andrew Walbran <qwandor@google.com> Wed Aug 10 13:33:57 2022 +0000
committer Andrew Walbran <qwandor@google.com> Tue Jan 10 14:31:48 2023 +0000
tree 67920c6e97886b7c69d08bdf81e5a33c68e48e32
parent e03da0d38c24898673b7060d7f0f32e79b14b304

Prepare for clap 4.

Bug: 260823636
Test: atest vm.test encryptedstore.test apkdmverity.test open_then_run.test ZipFuseTest
Change-Id: Iba2c4c317e7e42fc99362caf41ab083b4fc4a8db

vm/TEST_MAPPING

diff --git a/vm/TEST_MAPPING b/vm/TEST_MAPPING
index a8d1fa6..485c3af 100644
--- a/vm/TEST_MAPPING
+++ b/vm/TEST_MAPPING
@@ -1,7 +1,7 @@
 {
-  "avf-presubmit" : [
+  "avf-presubmit": [
     {
-      "name" : "vm.test"
+      "name": "vm.test"
     }
   ]
 }

vm/src/main.rs

diff --git a/vm/src/main.rs b/vm/src/main.rs
index 9fa805e..b364275 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -387,10 +387,11 @@
 #[cfg(test)]
 mod tests {
     use super::*;
-    use clap::IntoApp;
+    use clap::CommandFactory;
 
     #[test]
     fn verify_app() {
-        Opt::into_app().debug_assert();
+        // Check that the command parsing has been configured in a valid way.
+        Opt::command().debug_assert();
     }
 }