commit 14c78ed1094c73fa1a154f10efe51be18427ec67
author Patrick Williams <patrick@stwcx.xyz> Sun Jul 16 18:02:26 2023 -0500
committer Patrick Williams <patrick@stwcx.xyz> Sun Jul 16 18:02:31 2023 -0500
tree 6be169c5c2d790a0665556487ca293ce5a4749eb
parent 41dedad6e9a024ddaf14ab91e61e31183b7ac4aa

use std::format

Remove use of fmt and replace with the std::format version.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ib89de0b3d10866276964db7b3fa8d97991df410d

README.md

diff --git a/README.md b/README.md
index 7b2da0b..93c76b4 100644
--- a/README.md
+++ b/README.md
@@ -52,19 +52,6 @@
 make install
 ```
 
-#### Building fmtlib
-
-Check out the [fmtlib source](https://github.com/fmtlib/fmt).
-
-Then run these commands in the source directory.
-
-```
-mkdir build && cd build
-cmake ..
-make
-make install
-```
-
 #### Building span-lite
 
 Check out the [span-lite source](https://github.com/martinmoene/span-lite).

meson.build

diff --git a/meson.build b/meson.build
index c45a49b..7ea5697 100644
--- a/meson.build
+++ b/meson.build
@@ -143,7 +143,6 @@
     gtest_opt = import('cmake').subproject_options()
     gtest_opt.append_compile_args('c++', ['-DCMAKE_CXX_FLAGS=-Wno-pedantic'])
     gtest_proj = cmake.subproject('googletest', options: gtest_opt, required: false)
-    fmt_depj.dependency('fmt')
 
     if gtest_proj.found()
       gtest = declare_dependency(

subprojects/fmt.wrap

diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap
deleted file mode 100644
index 6847ae5..0000000
--- a/subprojects/fmt.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/fmtlib/fmt
-revision = HEAD

tools/p2a.cpp

diff --git a/tools/p2a.cpp b/tools/p2a.cpp
index 3cd641a..50e891d 100644
--- a/tools/p2a.cpp
+++ b/tools/p2a.cpp
@@ -21,13 +21,12 @@
 #include "pci.hpp"
 #include "tool_errors.hpp"
 
-#include <fmt/format.h>
-
 #include <ipmiblob/blob_errors.hpp>
 #include <stdplus/handle/managed.hpp>
 
 #include <cstdint>
 #include <cstring>
+#include <format>
 #include <memory>
 #include <span>
 #include <string>
@@ -90,7 +89,7 @@
     {
         (void)inputFd.release();
         throw internal::errnoException(
-            fmt::format("Error opening file '{}'", input));
+            std::format("Error opening file '{}'", input));
     }
 
     fileSize = sys->getSize(input.c_str());

tools/pci.cpp

diff --git a/tools/pci.cpp b/tools/pci.cpp
index 8403771..de3fb51 100644
--- a/tools/pci.cpp
+++ b/tools/pci.cpp
@@ -25,11 +25,10 @@
 
 #include "helper.hpp"
 
-#include <fmt/format.h>
-
 #include <stdplus/handle/managed.hpp>
 
 #include <cstring>
+#include <format>
 #include <span>
 #include <system_error>
 
@@ -74,7 +73,7 @@
 
     if (!dev)
     {
-        throw NotFoundException(fmt::format(
+        throw NotFoundException(std::format(
             "PCI device {:#04x}:{:#04x}", match->vendor_id, match->device_id));
     }
 
@@ -110,7 +109,7 @@
     if (data.size() > dataLength)
     {
         throw ToolException(
-            fmt::format("Write of {} bytes exceeds maximum of {}", data.size(),
+            std::format("Write of {} bytes exceeds maximum of {}", data.size(),
                         dataLength));
     }