kstd: flatten units namespace

2 files changed, 14 insertions, 14 deletions

diff --git a/libs/multiboot2/multiboot2/information.hpp b/libs/multiboot2/multiboot2/information.hpp
index f12969e8..709d64a8 100644
--- a/libs/multiboot2/multiboot2/information.hpp
+++ b/libs/multiboot2/multiboot2/information.hpp
@@ -124,9 +124,9 @@ namespace multiboot2
       return {data(), vla_tag::size()};
     }
 
-    [[nodiscard]] constexpr auto size() const noexcept -> kstd::units::bytes
+    [[nodiscard]] constexpr auto size() const noexcept -> kstd::bytes
     {
-      return kstd::units::bytes{end_address - start_address};
+      return kstd::bytes{end_address - start_address};
     }
   };
 
@@ -157,9 +157,9 @@ namespace multiboot2
     using pointer = iterator::pointer;
     using reference = iterator::reference;
 
-    [[nodiscard]] auto size() const noexcept -> kstd::units::bytes
+    [[nodiscard]] auto size() const noexcept -> kstd::bytes
     {
-      return kstd::units::bytes{m_size};
+      return kstd::bytes{m_size};
     }
 
     // Range access
diff --git a/libs/multiboot2/multiboot2/information/data.hpp b/libs/multiboot2/multiboot2/information/data.hpp
index 734bbc6f..59d82b9e 100644
--- a/libs/multiboot2/multiboot2/information/data.hpp
+++ b/libs/multiboot2/multiboot2/information/data.hpp
@@ -29,14 +29,14 @@ namespace multiboot2
     //! loader.
     struct basic_memory : tag_data<information_id::basic_memory_information>
     {
-      [[nodiscard]] constexpr auto lower() const noexcept -> kstd::units::bytes
+      [[nodiscard]] constexpr auto lower() const noexcept -> kstd::bytes
       {
-        return kstd::units::bytes{lower_KiB * 1024};
+        return kstd::bytes{lower_KiB * 1024};
       }
 
-      [[nodiscard]] constexpr auto upper() const noexcept -> kstd::units::bytes
+      [[nodiscard]] constexpr auto upper() const noexcept -> kstd::bytes
       {
-        return kstd::units::bytes{upper_KiB * 1024};
+        return kstd::bytes{upper_KiB * 1024};
       }
 
       //! The amount of lower memory available to the system.
@@ -84,9 +84,9 @@ namespace multiboot2
     //! time. The array begins after the last member of this structure.
     struct elf_symbols : tag_data<information_id::elf_sections>
     {
-      [[nodiscard]] constexpr auto entry_size() const noexcept -> kstd::units::bytes
+      [[nodiscard]] constexpr auto entry_size() const noexcept -> kstd::bytes
       {
-        return kstd::units::bytes{entry_size_in_B};
+        return kstd::bytes{entry_size_in_B};
       }
 
       //! The number of section header table entries.
@@ -119,9 +119,9 @@ namespace multiboot2
           return type == memory_type::available;
         }
 
-        [[nodiscard]] constexpr auto size() const noexcept -> kstd::units::bytes
+        [[nodiscard]] constexpr auto size() const noexcept -> kstd::bytes
         {
-          return kstd::units::bytes{size_in_B};
+          return kstd::bytes{size_in_B};
         }
 
         //! The physical start address of this region
@@ -139,9 +139,9 @@ namespace multiboot2
         std::uint32_t : 0;
       };
 
-      [[nodiscard]] constexpr auto entry_size() const noexcept -> kstd::units::bytes
+      [[nodiscard]] constexpr auto entry_size() const noexcept -> kstd::bytes
       {
-        return kstd::units::bytes{entry_size_in_B};
+        return kstd::bytes{entry_size_in_B};
       }
 
       //! The size of each entry present in the map.