♻️ remove iostream usages in favour of std::print

Author: dead-tech

src/Application.cpp

@@ -3,9 +3,7 @@
 
 #include <algorithm>
 #include <filesystem>
-#include <format>
 #include <GLFW/glfw3.h>
-#include <iostream>
 #include <print>
 #include <ranges>
 
@@ -49,9 +47,7 @@ namespace
 
 void glfw_error_callback(int error, const char *description)
 {
-    std::cerr << std::format(
-      "[ERROR] GLFW Error ({}): {}\n", error, description
-    );
+    std::print(stderr, "[ERROR] GLFW Error ({}): {}\n", error, description);
 }
 } // namespace
 
@@ -60,7 +56,7 @@ auto App::spawn() -> std::unique_ptr<App>
     glfwSetErrorCallback(glfw_error_callback);
 
     if (glfwInit() == 0) {
-        std::cerr << std::format("[ERROR] Glfw failed initialize\n");
+        std::print(stderr, "[ERROR] Glfw failed initialize\n");
         return nullptr;
     }
 
@@ -71,7 +67,7 @@ auto App::spawn() -> std::unique_ptr<App>
     GLFWwindow *window =
       glfwCreateWindow(WINDOW_WIDTH, WINDOW_HEIGHT, "sesamo", nullptr, nullptr);
     if (window == nullptr) {
-        std::cerr << std::format("[ERROR] Glfw failed to create window\n");
+        std::print(stderr, "[ERROR] Glfw failed to create window\n");
         return nullptr;
     }
 
@@ -336,9 +332,7 @@ void App::render_serial_output()
     }
 
     std::string output;
-    for (const auto &line : received_messages_buffer) {
-        output += line;
-    }
+    for (const auto &line : received_messages_buffer) { output += line; }
     ImGui::TextUnformatted(output.c_str());
 
     if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY()) {

src/Serial.cpp

@@ -2,28 +2,33 @@
 
 #include <cstring>
 #include <fcntl.h>
-#include <format>
-#include <iostream>
 #include <mutex>
 #include <termios.h>
 #include <unistd.h>
+#include <print>
 
 auto Serial::open(const std::filesystem::path &path, const int baud_rate)
-    -> std::optional<std::shared_ptr<Serial>>
+  -> std::optional<std::shared_ptr<Serial>>
 {
     // NOLINTNEXTLINE
     const auto fd = ::open(path.c_str(), O_RDWR | O_NOCTTY | O_SYNC);
     if (fd < 0) {
-        std::cerr << std::format(
-            "[ERROR] failed to open serial port {}: {}\n", path.string(), strerror(errno)
+        std::print(
+          stderr,
+          "[ERROR] failed to open serial port {}: {}\n",
+          path.string(),
+          strerror(errno)
         );
         return std::nullopt;
     }
 
     struct termios tty{};
     if (tcgetattr(fd, &tty) < 0) {
-        std::cerr << std::format(
-            "[ERROR] failed to get tty current attributes for {}: {}\n", path.string(), strerror(errno)
+        std::print(
+          stderr,
+          "[ERROR] failed to get tty current attributes for {}: {}\n",
+          path.string(),
+          strerror(errno)
         );
         ::close(fd);
         return std::nullopt;
@@ -41,7 +46,7 @@ auto Serial::open(const std::filesystem::path &path, const int baud_rate)
 
     /* setup for non-canonical mode */
     tty.c_iflag &=
-        ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+      ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
     tty.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
     tty.c_oflag &= ~OPOST;
 
@@ -50,27 +55,32 @@ auto Serial::open(const std::filesystem::path &path, const int baud_rate)
     tty.c_cc[VTIME] = 10; // Adjust timeout as needed
 
     if (tcsetattr(fd, TCSANOW, &tty) != 0) {
-        std::cerr << std::format(
-            "[ERROR] failed to set tty attributes for {}: {}\n", path.string(), strerror(errno)
+        std::print(
+          stderr,
+          "[ERROR] failed to set tty attributes for {}: {}\n",
+          path.string(),
+          strerror(errno)
         );
         ::close(fd);
         return std::nullopt;
     }
 
     auto serial_instance = std::shared_ptr<Serial>(new Serial(fd));
-    serial_instance->read_thread = std::thread(&Serial::read_loop, serial_instance);
+    serial_instance->read_thread =
+      std::thread(&Serial::read_loop, serial_instance);
     serial_instance->connected.store(true, std::memory_order_relaxed);
     serial_instance->stop_reading.store(false, std::memory_order_relaxed);
 
     return serial_instance;
 }
 
-Serial::Serial(int fd) : fd(fd), connected(false), stop_reading(false) {}
+Serial::Serial(int fd)
+  : fd(fd),
+    connected(false),
+    stop_reading(false)
+{}
 
-Serial::~Serial()
-{
-    close();
-}
+Serial::~Serial() { close(); }
 
 void Serial::close()
 {
@@ -80,25 +90,25 @@ void Serial::close()
     }
     connected.store(false, std::memory_order_relaxed);
     stop_reading.store(true, std::memory_order_relaxed);
-    if (read_thread.joinable()) {
-        read_thread.join();
-    }
+    if (read_thread.joinable()) { read_thread.join(); }
 }
 
 void Serial::read_loop()
 {
     while (!stop_reading.load(std::memory_order_relaxed)) {
-        char msg[256];
-        const auto bytes = ::read(fd, static_cast<char*>(msg), sizeof(msg));
+        char       msg[256];
+        const auto bytes = ::read(fd, static_cast<char *>(msg), sizeof(msg));
         if (bytes > 0) {
-            std::string received_data(static_cast<char*>(msg), bytes);
+            std::string received_data(static_cast<char *>(msg), bytes);
             {
                 std::lock_guard<std::mutex> lock(read_buffer_mutex);
                 read_buffer.push_back(received_data);
             }
         } else if (bytes < 0) {
-            std::cerr << std::format(
-                "[ERROR] failed to read from serial port: {}\n", strerror(errno)
+            std::print(
+              stderr,
+              "[ERROR] failed to read from serial port: {}\n",
+              strerror(errno)
             );
             // FIXME: Consider what to do on read error: try to reconnect, signal error, etc.
             break;