Move to std::format
The OpenBMC project is moving from the fmt project to the built-in
std::format() support.
Update source files and meson files to move to std::format().
Tested:
* Verified builds cleanly in local CI
* Verified all automated tests run successfully
* Verified builds cleanly in bitbake
* Verified an affected phosphor-psu-monitor journal message still works
correctly.
* Verified an affected phosphor-power-sequencer journal message still
works correctly.
Change-Id: I97b63cf9d132e2b6f173afb30953a9083d68133f
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>
diff --git a/phosphor-power-supply/util.hpp b/phosphor-power-supply/util.hpp
index 22e192e..293d44d 100644
--- a/phosphor-power-supply/util.hpp
+++ b/phosphor-power-supply/util.hpp
@@ -3,8 +3,6 @@
#include "utility.hpp"
#include "xyz/openbmc_project/Common/error.hpp"
-#include <fmt/format.h>
-
#include <gpiod.hpp>
#include <phosphor-logging/elog-errors.hpp>
#include <phosphor-logging/elog.hpp>
@@ -12,6 +10,7 @@
#include <bitset>
#include <chrono>
+#include <format>
namespace phosphor::power::psu
{
@@ -43,7 +42,7 @@
bool present, const std::string& name) const override
{
using namespace phosphor::logging;
- log<level::INFO>(fmt::format("Updating inventory present property. "
+ log<level::INFO>(std::format("Updating inventory present property. "
"present:{} invpath:{} name:{}",
present, invpath, name)
.c_str());
@@ -81,7 +80,7 @@
catch (const std::exception& e)
{
log<level::ERR>(
- fmt::format(
+ std::format(
"Error in inventory manager call to update inventory: {}",
e.what())
.c_str());
@@ -116,7 +115,7 @@
{
using namespace phosphor::logging;
log<level::ERR>(
- fmt::format("Error in inventory manager call to update "
+ std::format("Error in inventory manager call to update "
"availability interface: {}",
e.what())
.c_str());
@@ -188,7 +187,7 @@
catch (const sdbusplus::exception_t& e)
{
using namespace phosphor::logging;
- log<level::INFO>(fmt::format("Error trying to handle health rollup "
+ log<level::INFO>(std::format("Error trying to handle health rollup "
"associations for {}: {}",
invpath, e.what())
.c_str());
@@ -209,7 +208,7 @@
if (chassisPaths.empty())
{
- throw std::runtime_error(fmt::format(
+ throw std::runtime_error(std::format(
"No association to a chassis found for {}", invpath));
}