refactor: Make subcommand propagation reusable

clap-rs · Jan 17, 2022 · 729f4e7 · 729f4e7
1 parent 7b7c76e
commit 729f4e7
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/src/build/app/mod.rs b/src/build/app/mod.rs
@@ -2775,32 +2775,31 @@ impl<'help> App<'help> {
 
     /// Propagate settings
     pub(crate) fn _propagate(&mut self) {
-        macro_rules! propagate_subcmd {
-            ($_self:expr, $sc:expr) => {{
-                // We have to create a new scope in order to tell rustc the borrow of `sc` is
-                // done and to recursively call this method
-                {
-                    if $_self.settings.is_set(AppSettings::PropagateVersion) {
-                        if $sc.version.is_none() && $_self.version.is_some() {
-                            $sc.version = Some($_self.version.unwrap());
-                        }
-                        if $sc.long_version.is_none() && $_self.long_version.is_some() {
-                            $sc.long_version = Some($_self.long_version.unwrap());
-                        }
-                    }
-
-                    $sc.settings = $sc.settings | $_self.g_settings;
-                    $sc.g_settings = $sc.g_settings | $_self.g_settings;
-                    $sc.term_w = $_self.term_w;
-                    $sc.max_w = $_self.max_w;
-                }
-            }};
+        debug!("App::_propagate:{}", self.name);
+        let mut subcommands = std::mem::take(&mut self.subcommands);
+        for sc in &mut subcommands {
+            self._propagate_subcommand(sc);
         }
+        self.subcommands = subcommands;
+    }
 
-        debug!("App::_propagate:{}", self.name);
+    fn _propagate_subcommand(&self, sc: &mut Self) {
+        // We have to create a new scope in order to tell rustc the borrow of `sc` is
+        // done and to recursively call this method
+        {
+            if self.settings.is_set(AppSettings::PropagateVersion) {
+                if sc.version.is_none() && self.version.is_some() {
+                    sc.version = Some(self.version.unwrap());
+                }
+                if sc.long_version.is_none() && self.long_version.is_some() {
+                    sc.long_version = Some(self.long_version.unwrap());
+                }
+            }
 
-        for sc in &mut self.subcommands {
-            propagate_subcmd!(self, sc);
+            sc.settings = sc.settings | self.g_settings;
+            sc.g_settings = sc.g_settings | self.g_settings;
+            sc.term_w = self.term_w;
+            sc.max_w = self.max_w;
         }
     }