Enforce space between definitions (mamba-org#3049)

.clang-format

@@ -69,6 +69,7 @@ PointerAlignment: Left
 QualifierAlignment: Custom  # Experimental
 QualifierOrder: [inline, static, constexpr, const, volatile, type]
 ReflowComments: 'true'
+SeparateDefinitionBlocks: Always
 SortIncludes: CaseInsensitive
 SortUsingDeclarations: Never
 SpaceAfterCStyleCast: 'true'

libmamba/include/mamba/api/clean.hpp

@@ -7,7 +7,6 @@
 #ifndef MAMBA_API_CLEAN_HPP
 #define MAMBA_API_CLEAN_HPP
 
-
 namespace mamba
 {
     const int MAMBA_CLEAN_ALL = 1 << 0;

libmamba/include/mamba/api/config.hpp

@@ -7,7 +7,6 @@
 #ifndef MAMBA_API_CONFIG_HPP
 #define MAMBA_API_CONFIG_HPP
 
-
 namespace mamba
 {
     class Configuration;

libmamba/include/mamba/api/configuration.hpp

@@ -18,7 +18,6 @@
 #include "mamba/fs/filesystem.hpp"
 #include "mamba/util/environment.hpp"
 
-
 namespace mamba
 {
     class Configuration;
@@ -407,6 +406,7 @@ namespace mamba
         {
             return m_context;
         }
+
         const Context& context() const
         {
             return m_context;

libmamba/include/mamba/api/configuration_impl.hpp

@@ -27,22 +27,27 @@ namespace mamba
             storage_type m_storage;
 
             cli_config() = default;
+
             cli_config(const T& value)
                 : m_storage(value)
             {
             }
+
             storage_type& storage()
             {
                 return m_storage;
             }
+
             bool has_value() const
             {
                 return m_storage.has_value();
             }
+
             const T& value() const
             {
                 return m_storage.value();
             }
+
             void reset()
             {
                 m_storage.reset();

libmamba/include/mamba/api/update.hpp

@@ -7,7 +7,6 @@
 #ifndef MAMBA_API_UPDATE_HPP
 #define MAMBA_API_UPDATE_HPP
 
-
 namespace mamba
 {
     class Configuration;

libmamba/include/mamba/core/activation.hpp

@@ -112,6 +112,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~PosixActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;
@@ -133,6 +134,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~CshActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;
@@ -154,6 +156,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~CmdExeActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;
@@ -175,6 +178,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~PowerShellActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;
@@ -196,6 +200,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~XonshActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;
@@ -217,6 +222,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~FishActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;
@@ -238,6 +244,7 @@ namespace mamba
             : Activator(context)
         {
         }
+
         virtual ~NuActivator() = default;
 
         std::string script(const EnvironmentTransform& env_transform) override;

libmamba/include/mamba/core/env_lockfile.hpp

@@ -100,6 +100,7 @@ namespace mamba
         {
             return m_packages;
         }
+
         const Meta& get_metadata() const
         {
             return m_metadata;

libmamba/include/mamba/core/execution.hpp

@@ -99,7 +99,6 @@ namespace mamba
             }
         }
 
-
         // Closes this executor:
         // Only returns once all tasks scheduled before this call are finished
         // and all owned execution resources (aka threads) are released.

libmamba/include/mamba/core/menuinst.hpp

@@ -8,6 +8,7 @@ namespace mamba
 {
     class Context;
     class TransactionContext;
+
     namespace fs
     {
         class u8path;

libmamba/include/mamba/core/pinning.hpp

@@ -15,6 +15,7 @@ namespace mamba
     class Context;
     class ChannelContext;
     class PrefixData;
+
     namespace fs
     {
         class u8path;

libmamba/include/mamba/core/run.hpp

@@ -22,6 +22,7 @@ namespace mamba
     LockFile lock_proc_dir();
 
     void daemonize();
+
     class ScopedProcFile
     {
         const fs::u8path location;

libmamba/include/mamba/core/satisfiability_error.hpp

@@ -76,12 +76,15 @@ namespace mamba
         struct RootNode
         {
         };
+
         struct PackageNode : PackageInfo
         {
         };
+
         struct UnresolvedDependencyNode : MatchSpec
         {
         };
+
         struct ConstraintNode : MatchSpec
         {
         };

libmamba/include/mamba/core/solution.hpp

@@ -27,29 +27,35 @@ namespace mamba
         {
             PackageInfo what;
         };
+
         struct Upgrade
         {
             PackageInfo remove;
             PackageInfo install;
         };
+
         struct Downgrade
         {
             PackageInfo remove;
             PackageInfo install;
         };
+
         struct Change
         {
             PackageInfo remove;
             PackageInfo install;
         };
+
         struct Reinstall
         {
             PackageInfo what;
         };
+
         struct Remove
         {
             PackageInfo remove;
         };
+
         struct Install
         {
             PackageInfo install;

libmamba/include/mamba/core/solver.hpp

@@ -55,7 +55,6 @@ namespace mamba
         std::string description;
     };
 
-
     class MSolver
     {
     public:

libmamba/include/mamba/core/thread_utils.hpp

@@ -42,6 +42,7 @@ namespace mamba
     public:
 
         thread_interrupted() = default;
+
         const char* what() const throw()
         {
             return "Thread interrupted";

libmamba/include/mamba/core/util.hpp

@@ -99,7 +99,6 @@ namespace mamba
     //    result == must_persist && must_persist_temporary_directories() == must_persist
     bool set_persist_temporary_directories(bool will_persist);
 
-
     class TemporaryDirectory
     {
     public:
@@ -327,7 +326,6 @@ namespace mamba
         tl::expected<std::shared_ptr<LockFileOwner>, mamba_error> impl;
     };
 
-
     void split_package_extension(const std::string& file, std::string& name, std::string& extension);
 
     std::string

libmamba/include/mamba/fs/filesystem.hpp

@@ -295,7 +295,6 @@ namespace mamba::fs
             return *this;
         }
 
-
         //---- Conversions ----
 
         // Returns an utf-8 string.
@@ -519,7 +518,6 @@ namespace mamba::fs
             return left.m_path != right;
         }
 
-
         //---- State ----
 
         bool empty() const noexcept
@@ -763,6 +761,7 @@ namespace mamba::fs
     {
         return iter;
     }
+
     inline directory_iterator end(directory_iterator) noexcept
     {
         return {};
@@ -934,7 +933,6 @@ namespace mamba::fs
         return std::filesystem::create_directory(path, attributes, std::forward<OtherArgs>(args)...);
     }
 
-
     // void create_directory_symlink(const path& to, const path& new_symlink);
     // void create_directory_symlink(const path& to, const path& new_symlink, error_code& ec)
     // noexcept;
@@ -980,7 +978,6 @@ namespace mamba::fs
         std::filesystem::current_path(path, std::forward<OtherArgs>(args)...);
     }
 
-
     // bool equivalent(const path& p1, const path& p2);
     // bool equivalent(const path& p1, const path& p2, error_code& ec) noexcept;
     template <typename... OtherArgs>

libmamba/include/mamba/specs/repo_data.hpp

@@ -169,7 +169,6 @@ namespace mamba::specs
      */
     void from_json(const nlohmann::json& j, RepoDataPackage& p);
 
-
     /** Information about subdirectory of channel in the Conda RepoData. */
     struct ChannelInfo
     {

libmamba/include/mamba/util/flat_binary_tree.hpp

@@ -32,12 +32,14 @@ namespace mamba::util
 
         using branch_type = Branch;
         using leaf_type = Leaf;
+
         struct branch_node
         {
             branch_type data;
             std::size_t left_child = 0;
             std::size_t right_child = 0;
         };
+
         using leaf_node = leaf_type;
         using node_type = std::variant<branch_node, leaf_node>;
         using node_list = std::vector<node_type>;

libmamba/include/mamba/util/flat_bool_expr_tree.hpp

@@ -105,9 +105,11 @@ namespace mamba::util
     private:
 
         using postfix_parser_type = PostfixParser<variable_type, operator_type>;
+
         struct LeftParenthesis
         {
         };
+
         using operator_or_parenthesis_type = std::variant<operator_type, LeftParenthesis>;
         using operator_stack_type = std::vector<operator_or_parenthesis_type>;
 

libmamba/include/mamba/util/graph.hpp

@@ -144,22 +144,27 @@ namespace mamba::util
         void start_node(node_id, const graph_t&)
         {
         }
+
         void finish_node(node_id, const graph_t&)
         {
         }
 
         void start_edge(node_id, node_id, const graph_t&)
         {
         }
+
         void tree_edge(node_id, node_id, const graph_t&)
         {
         }
+
         void back_edge(node_id, node_id, const graph_t&)
         {
         }
+
         void forward_or_cross_edge(node_id, node_id, const graph_t&)
         {
         }
+
         void finish_edge(node_id, node_id, const graph_t&)
         {
         }

libmamba/include/mamba/util/iterator.hpp

@@ -67,7 +67,6 @@ namespace mamba::util
         using difference_type = D;
         using iterator_category = std::bidirectional_iterator_tag;
 
-
         friend derived_type operator--(derived_type& d, int)
         {
             derived_type tmp(d);
@@ -217,7 +216,6 @@ namespace mamba::util
     template <class Predicate, class Iterator>
     using select_filter_iterator_base_t = typename select_filter_iterator_base<Predicate, Iterator>::type;
 
-
     template <class Predicate, class Iterator>
     class filter_iterator : public select_filter_iterator_base_t<Predicate, Iterator>
     {

libmamba/include/mamba/util/string.hpp

@@ -522,18 +522,21 @@ namespace mamba::util
         struct has_reserve : std::false_type
         {
         };
+
         template <class T>
         struct has_reserve<T, std::void_t<decltype(std::declval<T>().reserve(std::size_t()))>>
             : std::true_type
         {
         };
+
         template <typename T>
         inline constexpr bool has_reserve_v = has_reserve<T>::value;
 
         std::size_t length(const char* s);
         std::size_t length(const wchar_t* s);
         std::size_t length(const char c);
         std::size_t length(const wchar_t c);
+
         template <class T>
         std::size_t length(const T& s)
         {