From b7842c2e112085fff6722395991b709de822311f Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 10 Feb 2022 11:07:57 -0600
Subject: [PATCH] refactor: Flatten directory heirarchy

---
 src/build/{app/mod.rs => app.rs}               | 16 +++++-----------
 src/build/{app/settings.rs => app_settings.rs} |  0
 src/build/{app/tests.rs => app_tests.rs}       |  0
 src/build/{app => }/debug_asserts.rs           |  0
 src/build/mod.rs                               | 16 +++++++++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename src/build/{app/mod.rs => app.rs} (99%)
 rename src/build/{app/settings.rs => app_settings.rs} (100%)
 rename src/build/{app/tests.rs => app_tests.rs} (100%)
 rename src/build/{app => }/debug_asserts.rs (100%)

diff --git a/src/build/app/mod.rs b/src/build/app.rs
similarity index 99%
rename from src/build/app/mod.rs
rename to src/build/app.rs
index b63621eb..fd5474f1 100644
--- a/src/build/app/mod.rs
+++ b/src/build/app.rs
@@ -1,11 +1,3 @@
-#[cfg(debug_assertions)]
-mod debug_asserts;
-mod settings;
-#[cfg(test)]
-mod tests;
-
-pub use self::settings::{AppFlags, AppSettings};
-
 // Std
 use std::{
     collections::HashMap,
@@ -23,6 +15,8 @@ use os_str_bytes::RawOsStr;
 use yaml_rust::Yaml;
 
 // Internal
+use crate::build::app_settings::{AppFlags, AppSettings};
+use crate::build::debug_asserts::assert_app;
 use crate::build::{arg::ArgProvider, Arg, ArgGroup, ArgPredicate};
 use crate::error::ErrorKind;
 use crate::error::Result as ClapResult;
@@ -2802,14 +2796,14 @@ impl<'help> App<'help> {
             self.args._build();
 
             #[cfg(debug_assertions)]
-            self::debug_asserts::assert_app(self);
+            assert_app(self);
             self.settings.set(AppSettings::Built);
         } else {
             debug!("App::_build: already built");
         }
     }
 
-    fn _panic_on_missing_help(&self, help_required_globally: bool) {
+    pub(crate) fn _panic_on_missing_help(&self, help_required_globally: bool) {
         if self.is_set(AppSettings::HelpExpected) || help_required_globally {
             let args_missing_help: Vec<String> = self
                 .args
@@ -2831,7 +2825,7 @@ impl<'help> App<'help> {
     }
 
     #[cfg(debug_assertions)]
-    fn two_args_of<F>(&self, condition: F) -> Option<(&Arg<'help>, &Arg<'help>)>
+    pub(crate) fn two_args_of<F>(&self, condition: F) -> Option<(&Arg<'help>, &Arg<'help>)>
     where
         F: Fn(&Arg) -> bool,
     {
diff --git a/src/build/app/settings.rs b/src/build/app_settings.rs
similarity index 100%
rename from src/build/app/settings.rs
rename to src/build/app_settings.rs
diff --git a/src/build/app/tests.rs b/src/build/app_tests.rs
similarity index 100%
rename from src/build/app/tests.rs
rename to src/build/app_tests.rs
diff --git a/src/build/app/debug_asserts.rs b/src/build/debug_asserts.rs
similarity index 100%
rename from src/build/app/debug_asserts.rs
rename to src/build/debug_asserts.rs
diff --git a/src/build/mod.rs b/src/build/mod.rs
index 37502810..2c1dd0fe 100644
--- a/src/build/mod.rs
+++ b/src/build/mod.rs
@@ -4,12 +4,18 @@ mod macros;
 pub mod app;
 pub mod arg;
 
+mod app_settings;
 mod arg_group;
 mod usage_parser;
 
-pub use self::{
-    app::{App, AppFlags, AppSettings},
-    arg::{Arg, ArgFlags, ArgSettings, PossibleValue, ValueHint},
-    arg_group::ArgGroup,
-};
+#[cfg(debug_assertions)]
+mod debug_asserts;
+
+#[cfg(test)]
+mod app_tests;
+
+pub use self::app::App;
+pub use self::app_settings::{AppFlags, AppSettings};
+pub use self::arg::{Arg, ArgFlags, ArgSettings, PossibleValue, ValueHint};
+pub use self::arg_group::ArgGroup;
 pub(crate) use arg::ArgPredicate;