Merge branch 'main' into file-browser

3 files changed, 5 insertions, 6 deletions

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index bb4ce320..49554be8 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
-idf_component_register(SRCS INCLUDE_DIRS "include" REQUIRES "database" "span")
+idf_component_register(SRCS INCLUDE_DIRS "include" REQUIRES "memory")
diff --git a/src/util/include/debug.hpp b/src/util/include/debug.hpp
index 620b0974..27fb2999 100644
--- a/src/util/include/debug.hpp
+++ b/src/util/include/debug.hpp
@@ -8,13 +8,12 @@
 
 #include <iomanip>
 #include <ostream>
-
+#include <span>
 #include <string>
-#include "span.hpp"
 
 namespace util {
 
-inline std::string format_hex_string(cpp::span<const std::byte> data) {
+inline std::string format_hex_string(std::span<const std::byte> data) {
   std::ostringstream oss;
   std::ostringstream ascii_values;
   int count = 0;
diff --git a/src/util/random.cpp b/src/util/random.cpp
index ae543765..2b2af9c7 100644
--- a/src/util/random.cpp
+++ b/src/util/random.cpp
@@ -29,8 +29,8 @@ auto Random::Next() -> std::uint64_t {
   return komirand(&seed1_, &seed2_);
 }
 
-auto Random::RangeInclusive(std::uint64_t lower, std::uint64_t upper)
-    -> std::uint64_t {
+auto Random::RangeInclusive(std::uint64_t lower,
+                            std::uint64_t upper) -> std::uint64_t {
   return (Next() % (upper - lower + 1)) + lower;
 }