From ad01db9274e982dcd63171b32eb1f5cc800b6fab Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Mon, 17 Aug 2026 18:41:52 +0200
Subject: chore: replace expected by result

---
 kapi/kapi/filesystem.hpp                     | 14 ++++++--------
 kernel/kapi/filesystem.cpp                   | 13 ++++++-------
 kernel/kernel/filesystem/ext2/filesystem.cpp |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/kapi/kapi/filesystem.hpp b/kapi/kapi/filesystem.hpp
index da72f523..956dc116 100644
--- a/kapi/kapi/filesystem.hpp
+++ b/kapi/kapi/filesystem.hpp
@@ -13,7 +13,6 @@
 #include <kstd/units.hpp>
 
 #include <cstddef>
-#include <expected>
 #include <span>
 #include <string_view>
 
@@ -33,40 +32,39 @@ namespace kapi::filesystem
   //! @param source The source device or filesystem to mount.
   //! @param target The target mount point.
   //! @return Nothing on success, an error code otherwise.
-  auto mount(std::string_view source, std::string_view target) -> std::expected<void, kstd::error_code>;
+  auto mount(std::string_view source, std::string_view target) -> kstd::result<void>;
 
   //! Unmount a filesystem from the specified target path.
   //!
   //! @param target The target mount point to unmount.
   //! @return Nothing on success, an error code otherwise.
-  auto umount(std::string_view target) -> std::expected<void, kstd::error_code>;
+  auto umount(std::string_view target) -> kstd::result<void>;
 
   //! Open a file at the specified path.
   //!
   //! @param path The path to the file to open.
   //! @return A file descriptor on success, an error code otherwise.
-  auto open(std::string_view path) -> std::expected<std::size_t, kstd::error_code>;
+  auto open(std::string_view path) -> kstd::result<std::size_t>;
 
   //! Close a file descriptor.
   //!
   //! @param file_descriptor The file descriptor to close.
   //! @return Nothing on success, an error code otherwise .
-  auto close(size_t file_descriptor) -> std::expected<void, kstd::error_code>;
+  auto close(size_t file_descriptor) -> kstd::result<void>;
 
   //! Read bytes from a file into a given buffer.
   //!
   //! @param file_descriptor The file descriptor to read from.
   //! @param buffer The buffer to store the read data.
   //! @return The number of bytes read on success, an error code otherwise.
-  auto read(size_t file_descriptor, std::span<std::byte> buffer) -> std::expected<kstd::units::bytes, kstd::error_code>;
+  auto read(size_t file_descriptor, std::span<std::byte> buffer) -> kstd::result<kstd::units::bytes>;
 
   //! Write bytes from a given buffer to a file descriptor.
   //!
   //! @param file_descriptor The file descriptor to write to.
   //! @param buffer The buffer containing the data to write.
   //! @return The number of bytes written on success, an error code otherwise.
-  auto write(size_t file_descriptor, std::span<std::byte const> buffer)
-      -> std::expected<kstd::units::bytes, kstd::error_code>;
+  auto write(size_t file_descriptor, std::span<std::byte const> buffer) -> kstd::result<kstd::units::bytes>;
 
   //! Create a new directory at the specified path.
   //!
diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index 8582d89e..5910b48d 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -17,17 +17,17 @@
 
 namespace kapi::filesystem
 {
-  auto mount(std::string_view source, std::string_view target) -> std::expected<void, kstd::error_code>
+  auto mount(std::string_view source, std::string_view target) -> kstd::result<void>
   {
     return kernel::filesystem::vfs::get().mount(source, target);
   }
 
-  auto umount(std::string_view target) -> std::expected<void, kstd::error_code>
+  auto umount(std::string_view target) -> kstd::result<void>
   {
     return kernel::filesystem::vfs::get().unmount(target);
   }
 
-  auto open(std::string_view path) -> std::expected<std::size_t, kstd::error_code>
+  auto open(std::string_view path) -> kstd::result<std::size_t>
   {
     return kernel::filesystem::vfs::get().open(path).and_then([](auto dentry) {
       auto open_file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry);
@@ -35,7 +35,7 @@ namespace kapi::filesystem
     });
   }
 
-  auto close(size_t file_descriptor) -> std::expected<void, kstd::error_code>
+  auto close(size_t file_descriptor) -> kstd::result<void>
   {
     return kernel::filesystem::open_file_table::get()
         .file(file_descriptor)
@@ -44,15 +44,14 @@ namespace kapi::filesystem
         .and_then([=]() { return kernel::filesystem::open_file_table::get().remove_file(file_descriptor); });
   }
 
-  auto read(size_t file_descriptor, std::span<std::byte> buffer) -> std::expected<kstd::units::bytes, kstd::error_code>
+  auto read(size_t file_descriptor, std::span<std::byte> buffer) -> kstd::result<kstd::units::bytes>
   {
     return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
       return descriptor->read(buffer);
     });
   }
 
-  auto write(size_t file_descriptor, std::span<std::byte const> buffer)
-      -> std::expected<kstd::units::bytes, kstd::error_code>
+  auto write(size_t file_descriptor, std::span<std::byte const> buffer) -> kstd::result<kstd::units::bytes>
   {
     return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
       return descriptor->write(buffer);
diff --git a/kernel/kernel/filesystem/ext2/filesystem.cpp b/kernel/kernel/filesystem/ext2/filesystem.cpp
index ff84a459..c7d8aee4 100644
--- a/kernel/kernel/filesystem/ext2/filesystem.cpp
+++ b/kernel/kernel/filesystem/ext2/filesystem.cpp
@@ -550,7 +550,7 @@ namespace kernel::filesystem::ext2
   }
 
   auto filesystem::map_inode_block_index_to_global_block_number(size_t inode_block_index, inode_data data) const
-      -> std::expected<std::size_t, kstd::error_code>
+      -> kstd::result<std::size_t>
   {
     if (inode_block_index < constants::direct_block_count)
     {
-- 
cgit v1.2.3