clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Ica590f8613f1fb89ab1ca676ac51c1cc7e38d67f
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/presence/json_parser.cpp b/presence/json_parser.cpp
index ea1d496..d5705ef 100644
--- a/presence/json_parser.cpp
+++ b/presence/json_parser.cpp
@@ -190,14 +190,14 @@
eeprom["bind_delay_ms"].get<size_t>());
}
- auto fan = std::make_tuple(member["name"], member["path"],
- timeUntilError);
+ auto fan =
+ std::make_tuple(member["name"], member["path"], timeUntilError);
// Create a fan object
fans.emplace_back(std::make_tuple(fan, std::move(sensors)));
// Add fan presence policy
- auto policy = getPolicy(member["rpolicy"], fans.back(),
- std::move(eepromDevice));
+ auto policy =
+ getPolicy(member["rpolicy"], fans.back(), std::move(eepromDevice));
if (policy)
{
policies.emplace_back(std::move(policy));
@@ -213,9 +213,9 @@
// Create the error reporter class if necessary
if (std::any_of(_fans.begin(), _fans.end(), [](const auto& fan) {
- return std::get<std::optional<size_t>>(std::get<Fan>(fan)) !=
- std::nullopt;
- }))
+ return std::get<std::optional<size_t>>(std::get<Fan>(fan)) !=
+ std::nullopt;
+ }))
{
_reporter = std::make_unique<ErrorReporter>(_bus, _fans);
}
@@ -278,8 +278,8 @@
sensors.emplace_back(sensor.get<std::string>());
}
- return std::make_unique<PolicyAccess<Tach, JsonConfig>>(fanIndex,
- std::move(sensors));
+ return std::make_unique<PolicyAccess<Tach, JsonConfig>>(
+ fanIndex, std::move(sensors));
}
// Get a constructed presence sensor for fan presence detection by gpio
@@ -363,9 +363,8 @@
}
// Get a `Fallback` redundancy policy for the fan
-std::unique_ptr<RedundancyPolicy>
- getFallback(const fanPolicy& fan,
- std::unique_ptr<EEPROMDevice> eepromDevice)
+std::unique_ptr<RedundancyPolicy> getFallback(
+ const fanPolicy& fan, std::unique_ptr<EEPROMDevice> eepromDevice)
{
std::vector<std::reference_wrapper<PresenceSensor>> pSensors;
for (auto& fanSensor : std::get<fanPolicySensorListPos>(fan))