refactor: Remove forward_list dependency on GSL

oboukli · Nov 10, 2024 · d53cc4f · d53cc4f
1 parent a053c11
commit d53cc4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/include/forfun/container/forward_list.hpp b/include/forfun/container/forward_list.hpp
@@ -11,8 +11,7 @@
 #define FORFUN_CONTAINER_FORWARD_LIST_HPP_
 
 #include <concepts>
-
-#include <gsl/pointers>
+#include <utility>
 
 #include "forfun/container/internal/forward_list_node.hpp"
 
@@ -48,11 +47,12 @@ class forward_list final {
         return head_ == nullptr;
     }
 
-    auto push_front(T&& value) noexcept -> void
+    auto push_front(T&& value) -> void
     {
         internal::forward_list_node<T>* const aux{head_};
 
-        head_ = new internal::forward_list_node<T>(value);
+        // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
+        head_ = new internal::forward_list_node<T>(std::move(value));
 
         head_->next = aux;
     }
@@ -64,21 +64,20 @@ class forward_list final {
             return;
         }
 
-        gsl::owner<internal::forward_list_node<T>*> const aux{head_};
+        internal::forward_list_node<T>* const aux{head_};
         head_ = head_->next;
 
+        // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
         delete aux;
     }
 
     auto clear() noexcept -> void
     {
-        // clang-format off
-        for (gsl::owner<internal::forward_list_node<T>*> node = head_;
-            node != nullptr;)
-        // clang-format on
+        for (internal::forward_list_node<T>* node{head_}; node != nullptr;)
         {
             internal::forward_list_node<T>* const next = node->next;
 
+            // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
             delete node;
 
             node = next;

diff --git a/test/container/forward_list_test.cpp b/test/container/forward_list_test.cpp
@@ -4,9 +4,6 @@
 
 // SPDX-License-Identifier: MIT
 
-#include <cstddef>
-#include <iterator>
-
 #include <catch2/catch_test_macros.hpp>
 
 #include "forfun/container/forward_list.hpp"