From 44f28c5ceafafd88b68de6fe2c05fac332ff3c33 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 17 Aug 2026 14:02:08 +0200
Subject: kstd: implement erase_if for flat map

---
 kernel/kernel/filesystem/devfs/filesystem.cpp | 6 +++---
 kernel/kernel/filesystem/devfs/filesystem.hpp | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'kernel')

diff --git a/kernel/kernel/filesystem/devfs/filesystem.cpp b/kernel/kernel/filesystem/devfs/filesystem.cpp
index c8447a2d..cdc3bd1c 100644
--- a/kernel/kernel/filesystem/devfs/filesystem.cpp
+++ b/kernel/kernel/filesystem/devfs/filesystem.cpp
@@ -11,10 +11,10 @@
 
 #include <kapi/filesystem.hpp>
 
+#include <kstd/flat_map.hpp>
 #include <kstd/memory.hpp>
 #include <kstd/result.hpp>
 #include <kstd/system_error.hpp>
-#include <kstd/vector.hpp>
 
 #include <algorithm>
 #include <optional>
@@ -50,7 +50,7 @@ namespace kernel::filesystem::devfs
     std::ranges::for_each(device_number_registry::get().all(), [&](auto const & numbered) {
       if (auto device = numbered.device.lock())
       {
-        m_inodes.emplace_back(numbered.name, kstd::make_shared<device_inode>(device));
+        m_inodes.emplace(numbered.name, kstd::make_shared<device_inode>(device));
       }
     });
 
@@ -97,7 +97,7 @@ namespace kernel::filesystem::devfs
   {
     if (auto device = numbered.device.lock())
     {
-      m_inodes.emplace_back(numbered.name, kstd::make_shared<device_inode>(device));
+      m_inodes.emplace(numbered.name, kstd::make_shared<device_inode>(device));
     }
   }
 
diff --git a/kernel/kernel/filesystem/devfs/filesystem.hpp b/kernel/kernel/filesystem/devfs/filesystem.hpp
index 8d2199e3..986dc27f 100644
--- a/kernel/kernel/filesystem/devfs/filesystem.hpp
+++ b/kernel/kernel/filesystem/devfs/filesystem.hpp
@@ -14,11 +14,9 @@
 #include <kstd/result.hpp>
 #include <kstd/string.hpp>
 #include <kstd/system_error.hpp>
-#include <kstd/vector.hpp>
 
 #include <optional>
 #include <string_view>
-#include <utility>
 
 namespace kernel::filesystem::devfs
 {
@@ -51,8 +49,7 @@ namespace kernel::filesystem::devfs
     auto on_device_numbered(device_number_registry::entry const & numbered) -> void override;
     auto on_device_unnumbered(device_number_registry::entry const & numbered) -> void override;
 
-    // TODO: change to flat_map again once flat_map supports erase.
-    kstd::vector<std::pair<kstd::string, kstd::shared_ptr<device_inode>>> m_inodes{};
+    kstd::flat_map<kstd::string, kstd::shared_ptr<device_inode>> m_inodes{};
   };
 }  // namespace kernel::filesystem::devfs
 
-- 
cgit v1.2.3