refactor(silo): generic linter fixes

Author: taepper

src/config/config_interface.h

@@ -6,16 +6,13 @@
 #include <variant>
 
 #include <spdlog/spdlog.h>
+#include <nlohmann/json.hpp>
 
 #include "config/config_exception.h"
-#include "config/config_source_interface.h"
 #include "config/config_specification.h"
 #include "config/source/command_line_arguments.h"
 #include "config/source/environment_variables.h"
 #include "config/source/yaml_file.h"
-#include "silo/common/cons_list.h"
-#include "silo/common/fmt_formatters.h"
-#include "silo/common/overloaded.h"
 
 namespace silo::config {
 
@@ -27,7 +24,7 @@ namespace silo::config {
 // and instead creating a factory method would also be possible.
 template <typename C>
 concept Config = requires(
-   C c,
+   C config,
    const VerifiedConfigAttributes& config_source,
    const VerifiedCommandLineArguments& cmd_source
 ) {
@@ -48,10 +45,10 @@ concept Config = requires(
    /// exceptions, except overwriteFrom can call SILO_PANIC when there
    /// is an inconsistency (bug) between ConfigSpecification and
    /// overwriteFrom implementation.
-   { c.overwriteFrom(config_source) } -> std::same_as<void>;
+   { config.overwriteFrom(config_source) } -> std::same_as<void>;
 
    /// Validation / Sanity checks about the values of this config
-   { c.validate() } -> std::same_as<void>;
+   { config.validate() } -> std::same_as<void>;
 };
 
 std::optional<std::filesystem::path> getConfigFilePath(

src/config/config_key_path.cpp

@@ -3,8 +3,6 @@
 #include <fmt/format.h>
 #include <boost/algorithm/string/join.hpp>
 
-#include "config/source/yaml_file.h"
-
 namespace {
 bool isLowerCaseOrNumeric(char character) {
    return (std::islower(character) != 0 || std::isdigit(character) != 0);

src/config/config_source_interface.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "config/config_specification.h"
-#include "config/verified_config_attributes.h"
 
 namespace silo::config {
 

src/config/config_specification.cpp

@@ -1,9 +1,7 @@
 #include "config/config_specification.h"
 
-#include <iostream>
 #include <sstream>
 #include <string>
-#include <unordered_set>
 #include <vector>
 
 #include <boost/lexical_cast.hpp>
@@ -12,8 +10,6 @@
 #include "config/source/command_line_arguments.h"
 #include "config/source/environment_variables.h"
 #include "config/source/yaml_file.h"
-#include "silo/common/cons_list.h"
-#include "silo/common/fmt_formatters.h"
 #include "silo/common/panic.h"
 #include "silo/common/string_utils.h"
 

src/config/config_specification.h

@@ -4,13 +4,10 @@
 //! to hold configuration data.
 
 #include <optional>
-#include <span>
-#include <variant>
 
 #include "config/config_key_path.h"
 #include "config/config_value.h"
 #include "config/verified_config_attributes.h"
-#include "silo/common/cons_list.h"
 
 namespace silo::config {
 

src/config/config_value.cpp

@@ -4,8 +4,6 @@
 #include <boost/functional/hash.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "config/config_exception.h"
-#include "config/source/yaml_file.h"
 #include "silo/common/panic.h"
 
 namespace silo::config {

src/config/config_value.h

@@ -1,18 +1,16 @@
 #pragma once
 
 #include <filesystem>
-#include <optional>
 #include <string>
 #include <utility>
 #include <variant>
 #include <vector>
 
-#include "config/config_key_path.h"
 #include "silo/common/panic.h"
 
 namespace silo::config {
 
-enum class ConfigValueType { STRING, PATH, INT32, UINT32, UINT16, BOOL, LIST };
+enum class ConfigValueType : uint8_t { STRING, PATH, INT32, UINT32, UINT16, BOOL, LIST };
 
 constexpr std::string_view configValueTypeToString(ConfigValueType type) {
    switch (type) {

src/config/source/command_line_arguments.cpp

@@ -1,7 +1,5 @@
 #include "config/source/command_line_arguments.h"
 
-#include <map>
-
 #include <fmt/format.h>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/join.hpp>

src/config/source/command_line_arguments.h

@@ -18,7 +18,7 @@ class CommandLineArguments {
    explicit CommandLineArguments(std::span<const std::string> args_)
        : args(args_.begin(), args_.end()) {}
 
-   [[nodiscard]] inline std::string debugContext() const { return "command line arguments"; };
+   [[nodiscard]] static std::string debugContext() { return "command line arguments"; };
 
    static std::string configKeyPathToString(const ConfigKeyPath& key_path);
 

src/config/source/command_line_arguments.test.cpp

@@ -85,6 +85,8 @@ using silo::config::ConfigValue;
 using silo::config::ConfigValueType;
 using silo::config::YamlFile;
 
+namespace {
+
 auto foo_key = YamlFile::stringToConfigKeyPath("foo");
 auto bar_key = YamlFile::stringToConfigKeyPath("bar");
 ConfigSpecification specification{
@@ -98,6 +100,8 @@ ConfigSpecification specification{
        ConfigAttributeSpecification::createWithoutDefault(bar_key, ConfigValueType::INT32, "help")}
 };
 
+}  // namespace
+
 TEST(CommandLineArguments, verifyOneArgument) {
    std::vector<std::string> arguments{"--foo"};
    const CommandLineArguments under_test{{arguments.begin(), arguments.end()}};